Skip to content

Commit 9a3a75c

Browse files
tglsfdctglsfdc
committed
Fix an oversight in commit 4c70098.
I had supposed that the from_char_seq_search() call sites were all passing the constant arrays you'd expect them to pass ... but on looking closer, the one for DY format was passing the days[] array not days_short[]. This accidentally worked because the day abbreviations in English are all the same as the first three letters of the full day names. However, once we took out the "maximum comparison length" logic, it stopped working. As penance for that oversight, add regression test cases covering this, as well as every other switch case in DCH_from_char() that was not reached according to the code coverage report. Also, fold the DCH_RM and DCH_rm cases into one --- now that seq_search is case independent, there's no need to pass different comparison arrays for those cases. Back-patch, as the previous commit was.
1 parent 4c70098 commit 9a3a75c

File tree

3 files changed

+83
-8
lines changed

3 files changed

+83
-8
lines changed

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3448,7 +3448,7 @@ DCH_from_char(FormatNode *node, const char *in, TmFromChar *out, bool std,
34483448
case DCH_DY:
34493449
case DCH_Dy:
34503450
case DCH_dy:
3451-
from_char_seq_search(&value, &s, days,
3451+
from_char_seq_search(&value, &s, days_short,
34523452
n, have_error);
34533453
CHECK_ERROR;
34543454
from_char_set_int(&out->d, value, n, have_error);
@@ -3565,13 +3565,6 @@ DCH_from_char(FormatNode *node, const char *in, TmFromChar *out, bool std,
35653565
SKIP_THth(s, n->suffix);
35663566
break;
35673567
case DCH_RM:
3568-
from_char_seq_search(&value, &s, rm_months_upper,
3569-
n, have_error);
3570-
CHECK_ERROR;
3571-
from_char_set_int(&out->mm, MONTHS_PER_YEAR - value,
3572-
n, have_error);
3573-
CHECK_ERROR;
3574-
break;
35753568
case DCH_rm:
35763569
from_char_seq_search(&value, &s, rm_months_lower,
35773570
n, have_error);

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

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2660,6 +2660,18 @@ SELECT to_timestamp('1997 BC 11 16', 'YYYY BC MM DD');
26602660
Tue Nov 16 00:00:00 1997 PST BC
26612661
(1 row)
26622662

2663+
SELECT to_timestamp('1997 A.D. 11 16', 'YYYY B.C. MM DD');
2664+
to_timestamp
2665+
------------------------------
2666+
Sun Nov 16 00:00:00 1997 PST
2667+
(1 row)
2668+
2669+
SELECT to_timestamp('1997 B.C. 11 16', 'YYYY B.C. MM DD');
2670+
to_timestamp
2671+
---------------------------------
2672+
Tue Nov 16 00:00:00 1997 PST BC
2673+
(1 row)
2674+
26632675
SELECT to_timestamp('9-1116', 'Y-MMDD');
26642676
to_timestamp
26652677
------------------------------
@@ -2756,6 +2768,18 @@ SELECT to_timestamp('2011-12-18 11:38 PM', 'YYYY-MM-DD HH12:MI PM');
27562768
Sun Dec 18 23:38:00 2011 PST
27572769
(1 row)
27582770

2771+
SELECT to_timestamp('2011-12-18 11:38 A.M.', 'YYYY-MM-DD HH12:MI P.M.');
2772+
to_timestamp
2773+
------------------------------
2774+
Sun Dec 18 11:38:00 2011 PST
2775+
(1 row)
2776+
2777+
SELECT to_timestamp('2011-12-18 11:38 P.M.', 'YYYY-MM-DD HH12:MI P.M.');
2778+
to_timestamp
2779+
------------------------------
2780+
Sun Dec 18 23:38:00 2011 PST
2781+
(1 row)
2782+
27592783
SELECT to_timestamp('2011-12-18 11:38 +05', 'YYYY-MM-DD HH12:MI TZH');
27602784
to_timestamp
27612785
------------------------------
@@ -2786,6 +2810,14 @@ SELECT to_timestamp('2011-12-18 11:38 20', 'YYYY-MM-DD HH12:MI TZM');
27862810
Sun Dec 18 03:18:00 2011 PST
27872811
(1 row)
27882812

2813+
SELECT to_timestamp('2011-12-18 11:38 PST', 'YYYY-MM-DD HH12:MI TZ'); -- NYI
2814+
ERROR: formatting field "TZ" is only supported in to_char
2815+
SELECT to_timestamp('2018-11-02 12:34:56.025', 'YYYY-MM-DD HH24:MI:SS.MS');
2816+
to_timestamp
2817+
----------------------------------
2818+
Fri Nov 02 12:34:56.025 2018 PDT
2819+
(1 row)
2820+
27892821
SELECT i, to_timestamp('2018-11-02 12:34:56', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 6) i;
27902822
i | to_timestamp
27912823
---+------------------------------
@@ -2865,6 +2897,24 @@ SELECT i, to_timestamp('2018-11-02 12:34:56.123456', 'YYYY-MM-DD HH24:MI:SS.FF'
28652897

28662898
SELECT i, to_timestamp('2018-11-02 12:34:56.123456789', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 6) i;
28672899
ERROR: date/time field value out of range: "2018-11-02 12:34:56.123456789"
2900+
SELECT to_date('1 4 1902', 'Q MM YYYY'); -- Q is ignored
2901+
to_date
2902+
------------
2903+
04-01-1902
2904+
(1 row)
2905+
2906+
SELECT to_date('3 4 21 01', 'W MM CC YY');
2907+
to_date
2908+
------------
2909+
04-15-2001
2910+
(1 row)
2911+
2912+
SELECT to_date('2458872', 'J');
2913+
to_date
2914+
------------
2915+
01-23-2020
2916+
(1 row)
2917+
28682918
--
28692919
-- Check handling of multiple spaces in format and/or input
28702920
--
@@ -3029,6 +3079,19 @@ SELECT to_timestamp('19971)24', 'YYYYMMDD');
30293079
ERROR: invalid value "1)" for "MM"
30303080
DETAIL: Field requires 2 characters, but only 1 could be parsed.
30313081
HINT: If your source string is not fixed-width, try using the "FM" modifier.
3082+
-- We don't accept full-length day or month names if short form is specified:
3083+
SELECT to_timestamp('Friday 1-January-1999', 'DY DD MON YYYY');
3084+
ERROR: invalid value "da" for "DD"
3085+
DETAIL: Value must be an integer.
3086+
SELECT to_timestamp('Fri 1-January-1999', 'DY DD MON YYYY');
3087+
ERROR: invalid value "uary" for "YYYY"
3088+
DETAIL: Value must be an integer.
3089+
SELECT to_timestamp('Fri 1-Jan-1999', 'DY DD MON YYYY'); -- ok
3090+
to_timestamp
3091+
------------------------------
3092+
Fri Jan 01 00:00:00 1999 PST
3093+
(1 row)
3094+
30323095
-- Value clobbering:
30333096
SELECT to_timestamp('1997-11-Jan-16', 'YYYY-MM-Mon-DD');
30343097
ERROR: conflicting values for "Mon" field in formatting string

‎src/test/regress/sql/horology.sql‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,9 @@ SELECT to_timestamp('20000-1116', 'YYYY-MMDD');
365365
SELECT to_timestamp('1997 AD 11 16', 'YYYY BC MM DD');
366366
SELECT to_timestamp('1997 BC 11 16', 'YYYY BC MM DD');
367367

368+
SELECT to_timestamp('1997 A.D. 11 16', 'YYYY B.C. MM DD');
369+
SELECT to_timestamp('1997 B.C. 11 16', 'YYYY B.C. MM DD');
370+
368371
SELECT to_timestamp('9-1116', 'Y-MMDD');
369372

370373
SELECT to_timestamp('95-1116', 'YY-MMDD');
@@ -396,12 +399,19 @@ SELECT to_timestamp(' 20050302', 'YYYYMMDD');
396399
SELECT to_timestamp('2011-12-18 11:38 AM', 'YYYY-MM-DD HH12:MI PM');
397400
SELECT to_timestamp('2011-12-18 11:38 PM', 'YYYY-MM-DD HH12:MI PM');
398401

402+
SELECT to_timestamp('2011-12-18 11:38 A.M.', 'YYYY-MM-DD HH12:MI P.M.');
403+
SELECT to_timestamp('2011-12-18 11:38 P.M.', 'YYYY-MM-DD HH12:MI P.M.');
404+
399405
SELECT to_timestamp('2011-12-18 11:38 +05', 'YYYY-MM-DD HH12:MI TZH');
400406
SELECT to_timestamp('2011-12-18 11:38 -05', 'YYYY-MM-DD HH12:MI TZH');
401407
SELECT to_timestamp('2011-12-18 11:38 +05:20', 'YYYY-MM-DD HH12:MI TZH:TZM');
402408
SELECT to_timestamp('2011-12-18 11:38 -05:20', 'YYYY-MM-DD HH12:MI TZH:TZM');
403409
SELECT to_timestamp('2011-12-18 11:38 20', 'YYYY-MM-DD HH12:MI TZM');
404410

411+
SELECT to_timestamp('2011-12-18 11:38 PST', 'YYYY-MM-DD HH12:MI TZ'); -- NYI
412+
413+
SELECT to_timestamp('2018-11-02 12:34:56.025', 'YYYY-MM-DD HH24:MI:SS.MS');
414+
405415
SELECT i, to_timestamp('2018-11-02 12:34:56', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 6) i;
406416
SELECT i, to_timestamp('2018-11-02 12:34:56.1', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 6) i;
407417
SELECT i, to_timestamp('2018-11-02 12:34:56.12', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 6) i;
@@ -411,6 +421,10 @@ SELECT i, to_timestamp('2018-11-02 12:34:56.12345', 'YYYY-MM-DD HH24:MI:SS.FF' |
411421
SELECT i, to_timestamp('2018-11-02 12:34:56.123456', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 6) i;
412422
SELECT i, to_timestamp('2018-11-02 12:34:56.123456789', 'YYYY-MM-DD HH24:MI:SS.FF' || i) FROM generate_series(1, 6) i;
413423

424+
SELECT to_date('1 4 1902', 'Q MM YYYY'); -- Q is ignored
425+
SELECT to_date('3 4 21 01', 'W MM CC YY');
426+
SELECT to_date('2458872', 'J');
427+
414428
--
415429
-- Check handling of multiple spaces in format and/or input
416430
--
@@ -459,6 +473,11 @@ SELECT to_timestamp('19971', 'YYYYMMDD');
459473
-- Insufficient digit characters for a single node:
460474
SELECT to_timestamp('19971)24', 'YYYYMMDD');
461475

476+
-- We don't accept full-length day or month names if short form is specified:
477+
SELECT to_timestamp('Friday 1-January-1999', 'DY DD MON YYYY');
478+
SELECT to_timestamp('Fri 1-January-1999', 'DY DD MON YYYY');
479+
SELECT to_timestamp('Fri 1-Jan-1999', 'DY DD MON YYYY'); -- ok
480+
462481
-- Value clobbering:
463482
SELECT to_timestamp('1997-11-Jan-16', 'YYYY-MM-Mon-DD');
464483

0 commit comments

Comments
 (0)