diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2020-09-30 15:40:23 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2020-09-30 15:40:23 -0400 |
| commit | 99fd38c02299acdc2282ac2dea8057a7a8f5f807 (patch) | |
| tree | 9a115d1ad043d57e1e554ac7de134b562d5c933e /src/backend | |
| parent | db8e60b82d6af88a4c8e1f9572abd5f5d84906b2 (diff) | |
| download | postgresql-99fd38c02299acdc2282ac2dea8057a7a8f5f807.tar.gz postgresql-99fd38c02299acdc2282ac2dea8057a7a8f5f807.zip | |
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
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/utils/adt/formatting.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index 75c85a30070..67271ba3cb8 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -4570,8 +4570,11 @@ do_to_timestamp(text *date_txt, text *fmt, Oid collid, bool std, { /* If a 4-digit year is provided, we use that and ignore CC. */ tm->tm_year = tmfc.year; - if (tmfc.bc && tm->tm_year > 0) - tm->tm_year = -(tm->tm_year - 1); + if (tmfc.bc) + 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); } |