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

Commitd059999

Browse files
committed
Fix DecodeDateTime to allow timezone to appear before year. This had
historically worked in some but not all cases, but as of 8.2 it failed for alltimezone formats. Fix, and add regression test cases to catch futureregressions in this area. Per gripe from Adam Witney.
1 parente41c7bb commitd059999

File tree

3 files changed

+51
-5
lines changed

3 files changed

+51
-5
lines changed

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.180 2007/05/29 04:58:43 neilc Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.181 2007/06/12 15:58:32 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -721,11 +721,17 @@ DecodeDateTime(char **field, int *ftype, int nf,
721721
}
722722
/***
723723
* Already have a date? Then this might be a time zone name
724-
* with embedded punctuation (e.g. "America/New_York") or
725-
*arun-together time with trailing time zone (e.g. hhmmss-zz).
724+
* with embedded punctuation (e.g. "America/New_York") or a
725+
* run-together time with trailing time zone (e.g. hhmmss-zz).
726726
* - thomas 2001-12-25
727+
*
728+
* We consider it a time zone if we already have month & day.
729+
* This is to allow the form "mmm dd hhmmss tz year", which
730+
* we've historically accepted.
727731
***/
728-
elseif ((fmask&DTK_DATE_M)==DTK_DATE_M||ptype!=0)
732+
elseif (ptype!=0||
733+
((fmask& (DTK_M(MONTH) |DTK_M(DAY)))==
734+
(DTK_M(MONTH) |DTK_M(DAY))))
729735
{
730736
/* No time zone accepted? Then quit... */
731737
if (tzp==NULL)

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

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,38 @@ INSERT INTO TIMESTAMPTZ_TBL VALUES ('Feb 16 17:32:01 -0097');
153153
ERROR: time zone displacement out of range: "Feb 16 17:32:01 -0097"
154154
INSERT INTO TIMESTAMPTZ_TBL VALUES ('Feb 16 17:32:01 5097 BC');
155155
ERROR: timestamp out of range: "Feb 16 17:32:01 5097 BC"
156+
-- Alternate field order that we've historically supported (sort of)
157+
-- with regular and POSIXy timezone specs
158+
SELECT 'Wed Jul 11 10:51:14 America/New_York 2001'::timestamptz;
159+
timestamptz
160+
------------------------------
161+
Wed Jul 11 07:51:14 2001 PDT
162+
(1 row)
163+
164+
SELECT 'Wed Jul 11 10:51:14 GMT-4 2001'::timestamptz;
165+
timestamptz
166+
------------------------------
167+
Tue Jul 10 23:51:14 2001 PDT
168+
(1 row)
169+
170+
SELECT 'Wed Jul 11 10:51:14 GMT+4 2001'::timestamptz;
171+
timestamptz
172+
------------------------------
173+
Wed Jul 11 07:51:14 2001 PDT
174+
(1 row)
175+
176+
SELECT 'Wed Jul 11 10:51:14 PST-03:00 2001'::timestamptz;
177+
timestamptz
178+
------------------------------
179+
Wed Jul 11 00:51:14 2001 PDT
180+
(1 row)
181+
182+
SELECT 'Wed Jul 11 10:51:14 PST+03:00 2001'::timestamptz;
183+
timestamptz
184+
------------------------------
185+
Wed Jul 11 06:51:14 2001 PDT
186+
(1 row)
187+
156188
SELECT '' AS "64", d1 FROM TIMESTAMPTZ_TBL;
157189
64 | d1
158190
----+---------------------------------
@@ -724,7 +756,7 @@ SELECT '' AS "54", d1 as timestamptz,
724756
date_part( 'isoyear', d1) AS isoyear, date_part( 'week', d1) AS week,
725757
date_part( 'dow', d1) AS dow
726758
FROM TIMESTAMPTZ_TBL WHERE d1 BETWEEN '1902-01-01' AND '2038-01-01';
727-
54 |timestamptz | isoyear | week | dow
759+
54 | timestamptz | isoyear | week | dow
728760
----+---------------------------------+---------+------+-----
729761
| Wed Dec 31 16:00:00 1969 PST | 1970 | 1 | 3
730762
| Mon Feb 10 17:32:01 1997 PST | 1997 | 7 | 1

‎src/test/regress/sql/timestamptz.sql

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,14 @@ INSERT INTO TIMESTAMPTZ_TBL VALUES ('Jan 01 17:32:01 2001');
127127
INSERT INTO TIMESTAMPTZ_TBLVALUES ('Feb 16 17:32:01 -0097');
128128
INSERT INTO TIMESTAMPTZ_TBLVALUES ('Feb 16 17:32:01 5097 BC');
129129

130+
-- Alternate field order that we've historically supported (sort of)
131+
-- with regular and POSIXy timezone specs
132+
SELECT'Wed Jul 11 10:51:14 America/New_York 2001'::timestamptz;
133+
SELECT'Wed Jul 11 10:51:14 GMT-4 2001'::timestamptz;
134+
SELECT'Wed Jul 11 10:51:14 GMT+4 2001'::timestamptz;
135+
SELECT'Wed Jul 11 10:51:14 PST-03:00 2001'::timestamptz;
136+
SELECT'Wed Jul 11 10:51:14 PST+03:00 2001'::timestamptz;
137+
130138
SELECT''AS"64", d1FROM TIMESTAMPTZ_TBL;
131139

132140
-- Demonstrate functions and operators

0 commit comments

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