mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-08-24 05:37:19 +02:00
Fix handling of BC years in to_date/to_timestamp.
Previously, a conversion such as to_date('-44-02-01','YYYY-MM-DD') would result in '0045-02-01 BC', as the code attempted to interpret the negative year as BC, but failed to apply the correction needed for our internal handling of BC years. Fix the off-by-one problem. Also, arrange for the combination of a negative year and an explicit "BC" marker to cancel out and produce AD. This is how the negative-century case works, so it seems sane to do likewise. Continue to read "year 0000" as 1 BC. Oracle would throw an error, but we've accepted that case for a long time so I'm hesitant to change it in a back-patch. Per bug #16419 from Saeed Hubaishan. Back-patch to all supported branches. Dar Alathar-Yemen and Tom Lane Discussion: https://postgr.es/m/16419-d8d9db0a7553f01b@postgresql.org
This commit is contained in:
parent
ab0c9c0735
commit
b0fe0b022f
@ -6342,6 +6342,15 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
|
|||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
In <function>to_timestamp</function> and <function>to_date</function>,
|
||||||
|
negative years are treated as signifying BC. If you write both a
|
||||||
|
negative year and an explicit <literal>BC</literal> field, you get AD
|
||||||
|
again. An input of year zero is treated as 1 BC.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
|
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
In <function>to_timestamp</function> and <function>to_date</function>,
|
In <function>to_timestamp</function> and <function>to_date</function>,
|
||||||
|
@ -3754,8 +3754,11 @@ do_to_timestamp(text *date_txt, text *fmt,
|
|||||||
{
|
{
|
||||||
/* If a 4-digit year is provided, we use that and ignore CC. */
|
/* If a 4-digit year is provided, we use that and ignore CC. */
|
||||||
tm->tm_year = tmfc.year;
|
tm->tm_year = tmfc.year;
|
||||||
if (tmfc.bc && tm->tm_year > 0)
|
if (tmfc.bc)
|
||||||
tm->tm_year = -(tm->tm_year - 1);
|
tm->tm_year = -tm->tm_year;
|
||||||
|
/* correct for our representation of BC years */
|
||||||
|
if (tm->tm_year < 0)
|
||||||
|
tm->tm_year++;
|
||||||
}
|
}
|
||||||
fmask |= DTK_M(YEAR);
|
fmask |= DTK_M(YEAR);
|
||||||
}
|
}
|
||||||
|
@ -3011,6 +3011,45 @@ SELECT to_date('2458872', 'J');
|
|||||||
01-23-2020
|
01-23-2020
|
||||||
(1 row)
|
(1 row)
|
||||||
|
|
||||||
|
--
|
||||||
|
-- Check handling of BC dates
|
||||||
|
--
|
||||||
|
SELECT to_date('44-02-01 BC','YYYY-MM-DD BC');
|
||||||
|
to_date
|
||||||
|
---------------
|
||||||
|
02-01-0044 BC
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
SELECT to_date('-44-02-01','YYYY-MM-DD');
|
||||||
|
to_date
|
||||||
|
---------------
|
||||||
|
02-01-0044 BC
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
SELECT to_date('-44-02-01 BC','YYYY-MM-DD BC');
|
||||||
|
to_date
|
||||||
|
------------
|
||||||
|
02-01-0044
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
SELECT to_timestamp('44-02-01 11:12:13 BC','YYYY-MM-DD HH24:MI:SS BC');
|
||||||
|
to_timestamp
|
||||||
|
---------------------------------
|
||||||
|
Fri Feb 01 11:12:13 0044 PST BC
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
SELECT to_timestamp('-44-02-01 11:12:13','YYYY-MM-DD HH24:MI:SS');
|
||||||
|
to_timestamp
|
||||||
|
---------------------------------
|
||||||
|
Fri Feb 01 11:12:13 0044 PST BC
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
SELECT to_timestamp('-44-02-01 11:12:13 BC','YYYY-MM-DD HH24:MI:SS BC');
|
||||||
|
to_timestamp
|
||||||
|
------------------------------
|
||||||
|
Mon Feb 01 11:12:13 0044 PST
|
||||||
|
(1 row)
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Check handling of multiple spaces in format and/or input
|
-- Check handling of multiple spaces in format and/or input
|
||||||
--
|
--
|
||||||
@ -3198,6 +3237,12 @@ SELECT to_date('2016 366', 'YYYY DDD'); -- ok
|
|||||||
|
|
||||||
SELECT to_date('2016 367', 'YYYY DDD');
|
SELECT to_date('2016 367', 'YYYY DDD');
|
||||||
ERROR: date/time field value out of range: "2016 367"
|
ERROR: date/time field value out of range: "2016 367"
|
||||||
|
SELECT to_date('0000-02-01','YYYY-MM-DD'); -- allowed, though it shouldn't be
|
||||||
|
to_date
|
||||||
|
---------------
|
||||||
|
02-01-0001 BC
|
||||||
|
(1 row)
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Check behavior with SQL-style fixed-GMT-offset time zone (cf bug #8572)
|
-- Check behavior with SQL-style fixed-GMT-offset time zone (cf bug #8572)
|
||||||
--
|
--
|
||||||
|
@ -467,6 +467,17 @@ SELECT to_date('1 4 1902', 'Q MM YYYY'); -- Q is ignored
|
|||||||
SELECT to_date('3 4 21 01', 'W MM CC YY');
|
SELECT to_date('3 4 21 01', 'W MM CC YY');
|
||||||
SELECT to_date('2458872', 'J');
|
SELECT to_date('2458872', 'J');
|
||||||
|
|
||||||
|
--
|
||||||
|
-- Check handling of BC dates
|
||||||
|
--
|
||||||
|
|
||||||
|
SELECT to_date('44-02-01 BC','YYYY-MM-DD BC');
|
||||||
|
SELECT to_date('-44-02-01','YYYY-MM-DD');
|
||||||
|
SELECT to_date('-44-02-01 BC','YYYY-MM-DD BC');
|
||||||
|
SELECT to_timestamp('44-02-01 11:12:13 BC','YYYY-MM-DD HH24:MI:SS BC');
|
||||||
|
SELECT to_timestamp('-44-02-01 11:12:13','YYYY-MM-DD HH24:MI:SS');
|
||||||
|
SELECT to_timestamp('-44-02-01 11:12:13 BC','YYYY-MM-DD HH24:MI:SS BC');
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Check handling of multiple spaces in format and/or input
|
-- Check handling of multiple spaces in format and/or input
|
||||||
--
|
--
|
||||||
@ -535,6 +546,7 @@ SELECT to_date('2015 366', 'YYYY DDD');
|
|||||||
SELECT to_date('2016 365', 'YYYY DDD'); -- ok
|
SELECT to_date('2016 365', 'YYYY DDD'); -- ok
|
||||||
SELECT to_date('2016 366', 'YYYY DDD'); -- ok
|
SELECT to_date('2016 366', 'YYYY DDD'); -- ok
|
||||||
SELECT to_date('2016 367', 'YYYY DDD');
|
SELECT to_date('2016 367', 'YYYY DDD');
|
||||||
|
SELECT to_date('0000-02-01','YYYY-MM-DD'); -- allowed, though it shouldn't be
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Check behavior with SQL-style fixed-GMT-offset time zone (cf bug #8572)
|
-- Check behavior with SQL-style fixed-GMT-offset time zone (cf bug #8572)
|
||||||
|
Loading…
Reference in New Issue
Block a user