1
0
mirror of https://github.com/postgres/postgres.git synced 2025-05-21 15:54:08 +03: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:
Tom Lane 2020-09-30 15:40:23 -04:00
parent 7be02a3bf0
commit 19e7982681
4 changed files with 67 additions and 4 deletions

View File

@ -6175,8 +6175,18 @@ SELECT regexp_matches('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
<listitem> <listitem>
<para> <para>
The <literal>YYYY</literal> conversion from string to <type>timestamp</type> or In <function>to_timestamp</function> and <function>to_date</function>,
<type>date</type> has a restriction when processing years with more than 4 digits. You must 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>
<para>
In <function>to_timestamp</function> and <function>to_date</function>,
the <literal>YYYY</literal> conversion has a restriction when
processing years with more than 4 digits. You must
use some non-digit character or template after <literal>YYYY</literal>, use some non-digit character or template after <literal>YYYY</literal>,
otherwise the year is always interpreted as 4 digits. For example otherwise the year is always interpreted as 4 digits. For example
(with the year 20000): (with the year 20000):

View File

@ -3693,8 +3693,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++;
} }
} }
else if (tmfc.cc) /* use first year of century */ else if (tmfc.cc) /* use first year of century */

View File

@ -2957,6 +2957,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
-- --

View File

@ -455,6 +455,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
-- --