Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit621691d

Browse files
committed
In ISO datestyle, never emit just HH:MM, always emit HH:MM:SS or
HH:MM:SS.SSS... when there is a nonzero part-of-a-day field in aninterval value. The seconds part used to be suppressed if zero,but there's no equivalent behavior for timestamp, and since we'remodeling this format on timestamp it's probably wrong. Per complaintand patch from Larry Rosenman.
1 parentd2ba12b commit621691d

File tree

2 files changed

+82
-84
lines changed

2 files changed

+82
-84
lines changed

‎src/backend/utils/adt/datetime.c‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.105 2003/05/18 01:06:26 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.106 2003/06/25 21:14:14 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -3510,6 +3510,7 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)
35103510
is_before= (tm->tm_mday<0);
35113511
is_nonzero= TRUE;
35123512
}
3513+
35133514
if ((!is_nonzero)|| (tm->tm_hour!=0)|| (tm->tm_min!=0)
35143515
|| (tm->tm_sec!=0)|| (fsec!=0))
35153516
{
@@ -3523,7 +3524,7 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)
35233524
/* Mark as "non-zero" since the fields are now filled in */
35243525
is_nonzero= TRUE;
35253526

3526-
/* fractional seconds? */
3527+
/*needfractional seconds? */
35273528
if (fsec!=0)
35283529
{
35293530
#ifdefHAVE_INT64_TIMESTAMP
@@ -3536,14 +3537,11 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)
35363537
#endif
35373538
TrimTrailingZeros(cp);
35383539
cp+=strlen(cp);
3539-
is_nonzero= TRUE;
35403540
}
3541-
/* otherwise, integer seconds only? */
3542-
elseif (tm->tm_sec!=0)
3541+
else
35433542
{
35443543
sprintf(cp,":%02d",abs(tm->tm_sec));
35453544
cp+=strlen(cp);
3546-
is_nonzero= TRUE;
35473545
}
35483546
}
35493547
break;

‎src/test/regress/expected/interval.out‎

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -6,43 +6,43 @@ SET DATESTYLE = 'ISO';
66
SELECT INTERVAL '01:00' AS "One hour";
77
One hour
88
----------
9-
01:00
9+
01:00:00
1010
(1 row)
1111

1212
SELECT INTERVAL '+02:00' AS "Two hours";
1313
Two hours
1414
-----------
15-
02:00
15+
02:00:00
1616
(1 row)
1717

1818
SELECT INTERVAL '-08:00' AS "Eight hours";
1919
Eight hours
2020
-------------
21-
-08:00
21+
-08:00:00
2222
(1 row)
2323

2424
SELECT INTERVAL '-05' AS "Five hours";
2525
Five hours
2626
------------
27-
-05:00
27+
-05:00:00
2828
(1 row)
2929

3030
SELECT INTERVAL '-1 +02:03' AS "22 hours ago...";
3131
22 hours ago...
3232
-----------------
33-
-21:57
33+
-21:57:00
3434
(1 row)
3535

3636
SELECT INTERVAL '-1 days +02:03' AS "22 hours ago...";
3737
22 hours ago...
3838
-----------------
39-
-21:57
39+
-21:57:00
4040
(1 row)
4141

4242
SELECT INTERVAL '10 years -11 month -12 days +13:14' AS "9 years...";
43-
9 years...
44-
-------------------------------
45-
9 years 1 mon -11 days -10:46
43+
9 years...
44+
----------------------------------
45+
9 years 1 mon -11 days -10:46:00
4646
(1 row)
4747

4848
CREATE TABLE INTERVAL_TBL (f1 interval);
@@ -63,50 +63,50 @@ INSERT INTO INTERVAL_TBL (f1) VALUES ('@ 30 eons ago');
6363
ERROR: Bad interval external representation '@ 30 eons ago'
6464
-- test interval operators
6565
SELECT '' AS ten, INTERVAL_TBL.*;
66-
ten | f1
67-
-----+----------------
68-
| 00:01
69-
| 05:00
66+
ten | f1
67+
-----+-----------------
68+
| 00:01:00
69+
| 05:00:00
7070
| 10 days
7171
| 34 years
7272
| 3 mons
7373
| -00:00:14
7474
| 1 day 02:03:04
7575
| 6 years
7676
| 5 mons
77-
| 5 mons 12:00
77+
| 5 mons 12:00:00
7878
(10 rows)
7979

8080
SELECT '' AS nine, INTERVAL_TBL.*
8181
WHERE INTERVAL_TBL.f1 <> interval '@ 10 days';
82-
nine | f1
83-
------+----------------
84-
| 00:01
85-
| 05:00
82+
nine | f1
83+
------+-----------------
84+
| 00:01:00
85+
| 05:00:00
8686
| 34 years
8787
| 3 mons
8888
| -00:00:14
8989
| 1 day 02:03:04
9090
| 6 years
9191
| 5 mons
92-
| 5 mons 12:00
92+
| 5 mons 12:00:00
9393
(9 rows)
9494

9595
SELECT '' AS three, INTERVAL_TBL.*
9696
WHERE INTERVAL_TBL.f1 <= interval '@ 5 hours';
9797
three | f1
9898
-------+-----------
99-
| 00:01
100-
| 05:00
99+
| 00:01:00
100+
| 05:00:00
101101
| -00:00:14
102102
(3 rows)
103103

104104
SELECT '' AS three, INTERVAL_TBL.*
105105
WHERE INTERVAL_TBL.f1 < interval '@ 1 day';
106106
three | f1
107107
-------+-----------
108-
| 00:01
109-
| 05:00
108+
| 00:01:00
109+
| 05:00:00
110110
| -00:00:14
111111
(3 rows)
112112

@@ -119,81 +119,81 @@ SELECT '' AS one, INTERVAL_TBL.*
119119

120120
SELECT '' AS five, INTERVAL_TBL.*
121121
WHERE INTERVAL_TBL.f1 >= interval '@ 1 month';
122-
five |f1
123-
------+--------------
122+
five | f1
123+
------+-----------------
124124
| 34 years
125125
| 3 mons
126126
| 6 years
127127
| 5 mons
128-
| 5 mons 12:00
128+
| 5 mons 12:00:00
129129
(5 rows)
130130

131131
SELECT '' AS nine, INTERVAL_TBL.*
132132
WHERE INTERVAL_TBL.f1 > interval '@ 3 seconds ago';
133-
nine | f1
134-
------+----------------
135-
| 00:01
136-
| 05:00
133+
nine | f1
134+
------+-----------------
135+
| 00:01:00
136+
| 05:00:00
137137
| 10 days
138138
| 34 years
139139
| 3 mons
140140
| 1 day 02:03:04
141141
| 6 years
142142
| 5 mons
143-
| 5 mons 12:00
143+
| 5 mons 12:00:00
144144
(9 rows)
145145

146146
SELECT '' AS fortyfive, r1.*, r2.*
147147
FROM INTERVAL_TBL r1, INTERVAL_TBL r2
148148
WHERE r1.f1 > r2.f1
149149
ORDER BY r1.f1, r2.f1;
150-
fortyfive | f1 | f1
151-
-----------+----------------+----------------
152-
| 00:01 | -00:00:14
153-
| 05:00 | -00:00:14
154-
| 05:00| 00:01
155-
| 1 day 02:03:04 | -00:00:14
156-
| 1 day 02:03:04 | 00:01
157-
| 1 day 02:03:04 | 05:00
158-
| 10 days | -00:00:14
159-
| 10 days | 00:01
160-
| 10 days | 05:00
161-
| 10 days | 1 day 02:03:04
162-
| 3 mons | -00:00:14
163-
| 3 mons | 00:01
164-
| 3 mons | 05:00
165-
| 3 mons | 1 day 02:03:04
166-
| 3 mons | 10 days
167-
| 5 mons | -00:00:14
168-
| 5 mons | 00:01
169-
| 5 mons | 05:00
170-
| 5 mons | 1 day 02:03:04
171-
| 5 mons | 10 days
172-
| 5 mons | 3 mons
173-
| 5 mons 12:00 | -00:00:14
174-
| 5 mons 12:00| 00:01
175-
| 5 mons 12:00| 05:00
176-
| 5 mons 12:00 | 1 day 02:03:04
177-
| 5 mons 12:00 | 10 days
178-
| 5 mons 12:00 | 3 mons
179-
| 5 mons 12:00 | 5 mons
180-
| 6 years | -00:00:14
181-
| 6 years | 00:01
182-
| 6 years | 05:00
183-
| 6 years | 1 day 02:03:04
184-
| 6 years | 10 days
185-
| 6 years | 3 mons
186-
| 6 years | 5 mons
187-
| 6 years | 5 mons 12:00
188-
| 34 years | -00:00:14
189-
| 34 years | 00:01
190-
| 34 years | 05:00
191-
| 34 years | 1 day 02:03:04
192-
| 34 years | 10 days
193-
| 34 years | 3 mons
194-
| 34 years | 5 mons
195-
| 34 years | 5 mons 12:00
196-
| 34 years | 6 years
150+
fortyfive | f1| f1
151+
-----------+-----------------+-----------------
152+
| 00:01:00 | -00:00:14
153+
| 05:00:00 | -00:00:14
154+
| 05:00:00 | 00:01:00
155+
| 1 day 02:03:04| -00:00:14
156+
| 1 day 02:03:04| 00:01:00
157+
| 1 day 02:03:04| 05:00:00
158+
| 10 days| -00:00:14
159+
| 10 days| 00:01:00
160+
| 10 days| 05:00:00
161+
| 10 days| 1 day 02:03:04
162+
| 3 mons| -00:00:14
163+
| 3 mons| 00:01:00
164+
| 3 mons| 05:00:00
165+
| 3 mons| 1 day 02:03:04
166+
| 3 mons| 10 days
167+
| 5 mons| -00:00:14
168+
| 5 mons| 00:01:00
169+
| 5 mons| 05:00:00
170+
| 5 mons| 1 day 02:03:04
171+
| 5 mons| 10 days
172+
| 5 mons| 3 mons
173+
| 5 mons 12:00:00 | -00:00:14
174+
| 5 mons 12:00:00| 00:01:00
175+
| 5 mons 12:00:00| 05:00:00
176+
| 5 mons 12:00:00 | 1 day 02:03:04
177+
| 5 mons 12:00:00 | 10 days
178+
| 5 mons 12:00:00 | 3 mons
179+
| 5 mons 12:00:00 | 5 mons
180+
| 6 years| -00:00:14
181+
| 6 years| 00:01:00
182+
| 6 years| 05:00:00
183+
| 6 years| 1 day 02:03:04
184+
| 6 years| 10 days
185+
| 6 years| 3 mons
186+
| 6 years| 5 mons
187+
| 6 years| 5 mons 12:00:00
188+
| 34 years| -00:00:14
189+
| 34 years| 00:01:00
190+
| 34 years| 05:00:00
191+
| 34 years| 1 day 02:03:04
192+
| 34 years| 10 days
193+
| 34 years| 3 mons
194+
| 34 years| 5 mons
195+
| 34 years| 5 mons 12:00:00
196+
| 34 years| 6 years
197197
(45 rows)
198198

199199
SET DATESTYLE = 'postgres';

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp