pool/postgresql15
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Pull upstream patch to fix tests with timezone 2024b

Browse Source 
* postgresql-testsuite-timezone-fix.patch

OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql15?expand=0&rev=57
This commit is contained in:
Reinhard Max 2024-11-05 12:36:28 +00:00 committed by Git OBS Bridge
parent a5c51182c8
commit bf267a10df
3 changed files with 552 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

542
postgresql-testsuite-timezone-fix.patch Normal file
View File

@ -0,0 +1,542 @@
From 2b94ee58bf256e1b4682f21f13d0f2c73e1b0cc2 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 14 Sep 2024 17:55:03 -0400
Subject: [PATCH] Run regression tests with timezone America/Los_Angeles.
Historically we've used timezone "PST8PDT", but the recent release
2024b of tzdb changes the definition of that zone in a way that
breaks many test cases concerned with dates before 1970. Although
we've not yet adopted 2024b into our own tree, this is already
problematic for people using --with-system-tzdata if their platform
has already adopted 2024b. To work with both older and newer
versions of tzdb, switch to using "America/Los_Angeles", accepting
the ensuing changes in regression test results.
Back-patch to all supported branches.
Per report and patch from Wolfgang Walther.
Discussion: https://postgr.es/m/0a997455-5aba-4cf2-a354-d26d8bcbfae6@technowledgy.de
---
doc/src/sgml/ref/set.sgml | 4 +-
doc/src/sgml/regress.sgml | 6 +-
src/test/regress/expected/date.out | 10 +-
src/test/regress/expected/horology.out | 57 +++++----
src/test/regress/expected/timestamptz.out | 137 ++++++++++++----------
src/test/regress/pg_regress.c | 2 +-
src/test/regress/sql/horology.sql | 4 +-
src/test/regress/sql/timestamptz.sql | 5 +-
8 files changed, 120 insertions(+), 105 deletions(-)
diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml
index 5459b29525969..f0e6047e0b117 100644
--- a/doc/src/sgml/ref/set.sgml
+++ b/doc/src/sgml/ref/set.sgml
@@ -200,7 +200,7 @@ SELECT setseed(<replaceable>value</replaceable>);
<variablelist>
<varlistentry>
- <term><literal>'PST8PDT'</literal></term>
+ <term><literal>'America/Los_Angeles'</literal></term>
<listitem>
<para>
The time zone for Berkeley, California.
@@ -298,7 +298,7 @@ SET datestyle TO postgres, dmy;
<para>
Set the time zone for Berkeley, California:
<screen>
-SET TIME ZONE 'PST8PDT';
+SET TIME ZONE 'America/Los_Angeles';
</screen>
</para>
diff --git a/doc/src/sgml/regress.sgml b/doc/src/sgml/regress.sgml
index ec50efa20a31f..aa380c20de67b 100644
--- a/doc/src/sgml/regress.sgml
+++ b/doc/src/sgml/regress.sgml
@@ -521,11 +521,11 @@ make check NO_LOCALE=1
<para>
Most of the date and time results are dependent on the time zone
environment. The reference files are generated for time zone
- <literal>PST8PDT</literal> (Berkeley, California), and there will be
+ <literal>America/Los_Angeles</literal>, and there will be
apparent failures if the tests are not run with that time zone setting.
The regression test driver sets environment variable
- <envar>PGTZ</envar> to <literal>PST8PDT</literal>, which normally
- ensures proper results.
+ <envar>PGTZ</envar> to <literal>America/Los_Angeles</literal>,
+ which normally ensures proper results.
</para>
</sect2>
diff --git a/src/test/regress/expected/date.out b/src/test/regress/expected/date.out
index 75ff65937895e..341123978ce06 100644
--- a/src/test/regress/expected/date.out
+++ b/src/test/regress/expected/date.out
@@ -1264,7 +1264,7 @@ SELECT DATE_TRUNC('MILLENNIUM', TIMESTAMP '1970-03-20 04:30:00.00000'); -- 1001
SELECT DATE_TRUNC('MILLENNIUM', DATE '1970-03-20'); -- 1001-01-01
date_trunc
------------------------------
- Thu Jan 01 00:00:00 1001 PST
+ Thu Jan 01 00:00:00 1001 LMT
(1 row)
SELECT DATE_TRUNC('CENTURY', TIMESTAMP '1970-03-20 04:30:00.00000'); -- 1901
@@ -1288,13 +1288,13 @@ SELECT DATE_TRUNC('CENTURY', DATE '2004-08-10'); -- 2001-01-01
SELECT DATE_TRUNC('CENTURY', DATE '0002-02-04'); -- 0001-01-01
date_trunc
------------------------------
- Mon Jan 01 00:00:00 0001 PST
+ Mon Jan 01 00:00:00 0001 LMT
(1 row)
SELECT DATE_TRUNC('CENTURY', DATE '0055-08-10 BC'); -- 0100-01-01 BC
date_trunc
---------------------------------
- Tue Jan 01 00:00:00 0100 PST BC
+ Tue Jan 01 00:00:00 0100 LMT BC
(1 row)
SELECT DATE_TRUNC('DECADE', DATE '1993-12-25'); -- 1990-01-01
@@ -1306,13 +1306,13 @@ SELECT DATE_TRUNC('DECADE', DATE '1993-12-25'); -- 1990-01-01
SELECT DATE_TRUNC('DECADE', DATE '0004-12-25'); -- 0001-01-01 BC
date_trunc
---------------------------------
- Sat Jan 01 00:00:00 0001 PST BC
+ Sat Jan 01 00:00:00 0001 LMT BC
(1 row)
SELECT DATE_TRUNC('DECADE', DATE '0002-12-31 BC'); -- 0011-01-01 BC
date_trunc
---------------------------------
- Mon Jan 01 00:00:00 0011 PST BC
+ Mon Jan 01 00:00:00 0011 LMT BC
(1 row)
--
diff --git a/src/test/regress/expected/horology.out b/src/test/regress/expected/horology.out
index 735352976c78c..e41a71a67239d 100644
--- a/src/test/regress/expected/horology.out
+++ b/src/test/regress/expected/horology.out
@@ -1,11 +1,16 @@
--
-- HOROLOGY
--
-SET DateStyle = 'Postgres, MDY';
-SHOW TimeZone; -- Many of these tests depend on the prevailing setting
- TimeZone
-----------
- PST8PDT
+SHOW TimeZone; -- Many of these tests depend on the prevailing settings
+ TimeZone
+---------------------
+ America/Los_Angeles
+(1 row)
+
+SHOW DateStyle;
+ DateStyle
+---------------
+ Postgres, MDY
(1 row)
--
@@ -769,12 +774,12 @@ SELECT d1 + interval '1 year' AS one_year FROM TIMESTAMPTZ_TBL;
Sat Feb 14 17:32:01 1998 PST
Sun Feb 15 17:32:01 1998 PST
Mon Feb 16 17:32:01 1998 PST
- Thu Feb 16 17:32:01 0096 PST BC
- Sun Feb 16 17:32:01 0098 PST
- Fri Feb 16 17:32:01 0598 PST
- Wed Feb 16 17:32:01 1098 PST
- Sun Feb 16 17:32:01 1698 PST
- Fri Feb 16 17:32:01 1798 PST
+ Thu Feb 16 17:32:01 0096 LMT BC
+ Sun Feb 16 17:32:01 0098 LMT
+ Fri Feb 16 17:32:01 0598 LMT
+ Wed Feb 16 17:32:01 1098 LMT
+ Sun Feb 16 17:32:01 1698 LMT
+ Fri Feb 16 17:32:01 1798 LMT
Wed Feb 16 17:32:01 1898 PST
Mon Feb 16 17:32:01 1998 PST
Sun Feb 16 17:32:01 2098 PST
@@ -840,12 +845,12 @@ SELECT d1 - interval '1 year' AS one_year FROM TIMESTAMPTZ_TBL;
Wed Feb 14 17:32:01 1996 PST
Thu Feb 15 17:32:01 1996 PST
Fri Feb 16 17:32:01 1996 PST
- Mon Feb 16 17:32:01 0098 PST BC
- Thu Feb 16 17:32:01 0096 PST
- Tue Feb 16 17:32:01 0596 PST
- Sun Feb 16 17:32:01 1096 PST
- Thu Feb 16 17:32:01 1696 PST
- Tue Feb 16 17:32:01 1796 PST
+ Mon Feb 16 17:32:01 0098 LMT BC
+ Thu Feb 16 17:32:01 0096 LMT
+ Tue Feb 16 17:32:01 0596 LMT
+ Sun Feb 16 17:32:01 1096 LMT
+ Thu Feb 16 17:32:01 1696 LMT
+ Tue Feb 16 17:32:01 1796 LMT
Sun Feb 16 17:32:01 1896 PST
Fri Feb 16 17:32:01 1996 PST
Thu Feb 16 17:32:01 2096 PST
@@ -2124,7 +2129,7 @@ SELECT '2020-10-05'::timestamptz > '2202020-10-05'::date as f;
SELECT '4714-11-24 BC'::date::timestamptz;
timestamptz
---------------------------------
- Mon Nov 24 00:00:00 4714 PST BC
+ Mon Nov 24 00:00:00 4714 LMT BC
(1 row)
SET TimeZone = 'UTC-2';
@@ -2702,13 +2707,13 @@ RESET DateStyle;
SELECT to_timestamp('0097/Feb/16 --> 08:14:30', 'YYYY/Mon/DD --> HH:MI:SS');
to_timestamp
------------------------------
- Sat Feb 16 08:14:30 0097 PST
+ Sat Feb 16 08:14:30 0097 LMT
(1 row)
SELECT to_timestamp('97/2/16 8:14:30', 'FMYYYY/FMMM/FMDD FMHH:FMMI:FMSS');
to_timestamp
------------------------------
- Sat Feb 16 08:14:30 0097 PST
+ Sat Feb 16 08:14:30 0097 LMT
(1 row)
SELECT to_timestamp('2011$03!18 23_38_15', 'YYYY-MM-DD HH24:MI:SS');
@@ -2745,7 +2750,7 @@ SELECT to_timestamp('My birthday-> Year: 1976, Month: May, Day: 16',
SELECT to_timestamp('1,582nd VIII 21', 'Y,YYYth FMRM DD');
to_timestamp
------------------------------
- Sat Aug 21 00:00:00 1582 PST
+ Sat Aug 21 00:00:00 1582 LMT
(1 row)
SELECT to_timestamp('15 "text between quote marks" 98 54 45',
@@ -2809,7 +2814,7 @@ SELECT to_timestamp('1997 AD 11 16', 'YYYY BC MM DD');
SELECT to_timestamp('1997 BC 11 16', 'YYYY BC MM DD');
to_timestamp
---------------------------------
- Tue Nov 16 00:00:00 1997 PST BC
+ Tue Nov 16 00:00:00 1997 LMT BC
(1 row)
SELECT to_timestamp('1997 A.D. 11 16', 'YYYY B.C. MM DD');
@@ -2821,7 +2826,7 @@ SELECT to_timestamp('1997 A.D. 11 16', 'YYYY B.C. MM DD');
SELECT to_timestamp('1997 B.C. 11 16', 'YYYY B.C. MM DD');
to_timestamp
---------------------------------
- Tue Nov 16 00:00:00 1997 PST BC
+ Tue Nov 16 00:00:00 1997 LMT BC
(1 row)
SELECT to_timestamp('9-1116', 'Y-MMDD');
@@ -3091,19 +3096,19 @@ 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');
to_timestamp
---------------------------------
- Fri Feb 01 11:12:13 0044 PST BC
+ Fri Feb 01 11:12:13 0044 LMT 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
+ Fri Feb 01 11:12:13 0044 LMT 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
+ Mon Feb 01 11:12:13 0044 LMT
(1 row)
--
diff --git a/src/test/regress/expected/timestamptz.out b/src/test/regress/expected/timestamptz.out
index 790cae15abd8b..dd7887256bb9e 100644
--- a/src/test/regress/expected/timestamptz.out
+++ b/src/test/regress/expected/timestamptz.out
@@ -293,12 +293,12 @@ SELECT d1 FROM TIMESTAMPTZ_TBL;
Fri Feb 14 17:32:01 1997 PST
Sat Feb 15 17:32:01 1997 PST
Sun Feb 16 17:32:01 1997 PST
- Tue Feb 16 17:32:01 0097 PST BC
- Sat Feb 16 17:32:01 0097 PST
- Thu Feb 16 17:32:01 0597 PST
- Tue Feb 16 17:32:01 1097 PST
- Sat Feb 16 17:32:01 1697 PST
- Thu Feb 16 17:32:01 1797 PST
+ Tue Feb 16 17:32:01 0097 LMT BC
+ Sat Feb 16 17:32:01 0097 LMT
+ Thu Feb 16 17:32:01 0597 LMT
+ Tue Feb 16 17:32:01 1097 LMT
+ Sat Feb 16 17:32:01 1697 LMT
+ Thu Feb 16 17:32:01 1797 LMT
Tue Feb 16 17:32:01 1897 PST
Sun Feb 16 17:32:01 1997 PST
Sat Feb 16 17:32:01 2097 PST
@@ -322,19 +322,19 @@ SELECT d1 FROM TIMESTAMPTZ_TBL;
SELECT '4714-11-24 00:00:00+00 BC'::timestamptz;
timestamptz
---------------------------------
- Sun Nov 23 16:00:00 4714 PST BC
+ Sun Nov 23 16:07:02 4714 LMT BC
(1 row)
SELECT '4714-11-23 16:00:00-08 BC'::timestamptz;
timestamptz
---------------------------------
- Sun Nov 23 16:00:00 4714 PST BC
+ Sun Nov 23 16:07:02 4714 LMT BC
(1 row)
SELECT 'Sun Nov 23 16:00:00 4714 PST BC'::timestamptz;
timestamptz
---------------------------------
- Sun Nov 23 16:00:00 4714 PST BC
+ Sun Nov 23 16:07:02 4714 LMT BC
(1 row)
SELECT '4714-11-23 23:59:59+00 BC'::timestamptz; -- out of range
@@ -424,12 +424,12 @@ SELECT d1 FROM TIMESTAMPTZ_TBL
---------------------------------
-infinity
Wed Dec 31 16:00:00 1969 PST
- Tue Feb 16 17:32:01 0097 PST BC
- Sat Feb 16 17:32:01 0097 PST
- Thu Feb 16 17:32:01 0597 PST
- Tue Feb 16 17:32:01 1097 PST
- Sat Feb 16 17:32:01 1697 PST
- Thu Feb 16 17:32:01 1797 PST
+ Tue Feb 16 17:32:01 0097 LMT BC
+ Sat Feb 16 17:32:01 0097 LMT
+ Thu Feb 16 17:32:01 0597 LMT
+ Tue Feb 16 17:32:01 1097 LMT
+ Sat Feb 16 17:32:01 1697 LMT
+ Thu Feb 16 17:32:01 1797 LMT
Tue Feb 16 17:32:01 1897 PST
Wed Feb 28 17:32:01 1996 PST
Thu Feb 29 17:32:01 1996 PST
@@ -492,12 +492,12 @@ SELECT d1 FROM TIMESTAMPTZ_TBL
Fri Feb 14 17:32:01 1997 PST
Sat Feb 15 17:32:01 1997 PST
Sun Feb 16 17:32:01 1997 PST
- Tue Feb 16 17:32:01 0097 PST BC
- Sat Feb 16 17:32:01 0097 PST
- Thu Feb 16 17:32:01 0597 PST
- Tue Feb 16 17:32:01 1097 PST
- Sat Feb 16 17:32:01 1697 PST
- Thu Feb 16 17:32:01 1797 PST
+ Tue Feb 16 17:32:01 0097 LMT BC
+ Sat Feb 16 17:32:01 0097 LMT
+ Thu Feb 16 17:32:01 0597 LMT
+ Tue Feb 16 17:32:01 1097 LMT
+ Sat Feb 16 17:32:01 1697 LMT
+ Thu Feb 16 17:32:01 1797 LMT
Tue Feb 16 17:32:01 1897 PST
Sun Feb 16 17:32:01 1997 PST
Sat Feb 16 17:32:01 2097 PST
@@ -524,12 +524,12 @@ SELECT d1 FROM TIMESTAMPTZ_TBL
-infinity
Wed Dec 31 16:00:00 1969 PST
Thu Jan 02 00:00:00 1997 PST
- Tue Feb 16 17:32:01 0097 PST BC
- Sat Feb 16 17:32:01 0097 PST
- Thu Feb 16 17:32:01 0597 PST
- Tue Feb 16 17:32:01 1097 PST
- Sat Feb 16 17:32:01 1697 PST
- Thu Feb 16 17:32:01 1797 PST
+ Tue Feb 16 17:32:01 0097 LMT BC
+ Sat Feb 16 17:32:01 0097 LMT
+ Thu Feb 16 17:32:01 0597 LMT
+ Tue Feb 16 17:32:01 1097 LMT
+ Sat Feb 16 17:32:01 1697 LMT
+ Thu Feb 16 17:32:01 1797 LMT
Tue Feb 16 17:32:01 1897 PST
Wed Feb 28 17:32:01 1996 PST
Thu Feb 29 17:32:01 1996 PST
@@ -883,12 +883,12 @@ SELECT d1 as timestamptz,
Fri Feb 14 17:32:01 1997 PST | 1997 | 2 | 14 | 17 | 32 | 1
Sat Feb 15 17:32:01 1997 PST | 1997 | 2 | 15 | 17 | 32 | 1
Sun Feb 16 17:32:01 1997 PST | 1997 | 2 | 16 | 17 | 32 | 1
- Tue Feb 16 17:32:01 0097 PST BC | -97 | 2 | 16 | 17 | 32 | 1
- Sat Feb 16 17:32:01 0097 PST | 97 | 2 | 16 | 17 | 32 | 1
- Thu Feb 16 17:32:01 0597 PST | 597 | 2 | 16 | 17 | 32 | 1
- Tue Feb 16 17:32:01 1097 PST | 1097 | 2 | 16 | 17 | 32 | 1
- Sat Feb 16 17:32:01 1697 PST | 1697 | 2 | 16 | 17 | 32 | 1
- Thu Feb 16 17:32:01 1797 PST | 1797 | 2 | 16 | 17 | 32 | 1
+ Tue Feb 16 17:32:01 0097 LMT BC | -97 | 2 | 16 | 17 | 32 | 1
+ Sat Feb 16 17:32:01 0097 LMT | 97 | 2 | 16 | 17 | 32 | 1
+ Thu Feb 16 17:32:01 0597 LMT | 597 | 2 | 16 | 17 | 32 | 1
+ Tue Feb 16 17:32:01 1097 LMT | 1097 | 2 | 16 | 17 | 32 | 1
+ Sat Feb 16 17:32:01 1697 LMT | 1697 | 2 | 16 | 17 | 32 | 1
+ Thu Feb 16 17:32:01 1797 LMT | 1797 | 2 | 16 | 17 | 32 | 1
Tue Feb 16 17:32:01 1897 PST | 1897 | 2 | 16 | 17 | 32 | 1
Sun Feb 16 17:32:01 1997 PST | 1997 | 2 | 16 | 17 | 32 | 1
Sat Feb 16 17:32:01 2097 PST | 2097 | 2 | 16 | 17 | 32 | 1
@@ -957,12 +957,12 @@ SELECT d1 as timestamptz,
Fri Feb 14 17:32:01 1997 PST | 1 | 1000 | 1000000
Sat Feb 15 17:32:01 1997 PST | 1 | 1000 | 1000000
Sun Feb 16 17:32:01 1997 PST | 1 | 1000 | 1000000
- Tue Feb 16 17:32:01 0097 PST BC | 1 | 1000 | 1000000
- Sat Feb 16 17:32:01 0097 PST | 1 | 1000 | 1000000
- Thu Feb 16 17:32:01 0597 PST | 1 | 1000 | 1000000
- Tue Feb 16 17:32:01 1097 PST | 1 | 1000 | 1000000
- Sat Feb 16 17:32:01 1697 PST | 1 | 1000 | 1000000
- Thu Feb 16 17:32:01 1797 PST | 1 | 1000 | 1000000
+ Tue Feb 16 17:32:01 0097 LMT BC | 1 | 1000 | 1000000
+ Sat Feb 16 17:32:01 0097 LMT | 1 | 1000 | 1000000
+ Thu Feb 16 17:32:01 0597 LMT | 1 | 1000 | 1000000
+ Tue Feb 16 17:32:01 1097 LMT | 1 | 1000 | 1000000
+ Sat Feb 16 17:32:01 1697 LMT | 1 | 1000 | 1000000
+ Thu Feb 16 17:32:01 1797 LMT | 1 | 1000 | 1000000
Tue Feb 16 17:32:01 1897 PST | 1 | 1000 | 1000000
Sun Feb 16 17:32:01 1997 PST | 1 | 1000 | 1000000
Sat Feb 16 17:32:01 2097 PST | 1 | 1000 | 1000000
@@ -1032,12 +1032,12 @@ SELECT d1 as timestamptz,
Fri Feb 14 17:32:01 1997 PST | 1997 | 7 | 5 | 5 | 45
Sat Feb 15 17:32:01 1997 PST | 1997 | 7 | 6 | 6 | 46
Sun Feb 16 17:32:01 1997 PST | 1997 | 7 | 7 | 0 | 47
- Tue Feb 16 17:32:01 0097 PST BC | -97 | 7 | 2 | 2 | 47
- Sat Feb 16 17:32:01 0097 PST | 97 | 7 | 6 | 6 | 47
- Thu Feb 16 17:32:01 0597 PST | 597 | 7 | 4 | 4 | 47
- Tue Feb 16 17:32:01 1097 PST | 1097 | 7 | 2 | 2 | 47
- Sat Feb 16 17:32:01 1697 PST | 1697 | 7 | 6 | 6 | 47
- Thu Feb 16 17:32:01 1797 PST | 1797 | 7 | 4 | 4 | 47
+ Tue Feb 16 17:32:01 0097 LMT BC | -97 | 7 | 2 | 2 | 47
+ Sat Feb 16 17:32:01 0097 LMT | 97 | 7 | 6 | 6 | 47
+ Thu Feb 16 17:32:01 0597 LMT | 597 | 7 | 4 | 4 | 47
+ Tue Feb 16 17:32:01 1097 LMT | 1097 | 7 | 2 | 2 | 47
+ Sat Feb 16 17:32:01 1697 LMT | 1697 | 7 | 6 | 6 | 47
+ Thu Feb 16 17:32:01 1797 LMT | 1797 | 7 | 4 | 4 | 47
Tue Feb 16 17:32:01 1897 PST | 1897 | 7 | 2 | 2 | 47
Sun Feb 16 17:32:01 1997 PST | 1997 | 7 | 7 | 0 | 47
Sat Feb 16 17:32:01 2097 PST | 2097 | 7 | 6 | 6 | 47
@@ -1109,12 +1109,12 @@ SELECT d1 as timestamptz,
Fri Feb 14 17:32:01 1997 PST | 199 | 20 | 2 | 2450495 | 855970321
Sat Feb 15 17:32:01 1997 PST | 199 | 20 | 2 | 2450496 | 856056721
Sun Feb 16 17:32:01 1997 PST | 199 | 20 | 2 | 2450497 | 856143121
- Tue Feb 16 17:32:01 0097 PST BC | -10 | -1 | -1 | 1686043 | -65192682479
- Sat Feb 16 17:32:01 0097 PST | 9 | 1 | 1 | 1756537 | -59102000879
- Thu Feb 16 17:32:01 0597 PST | 59 | 6 | 1 | 1939158 | -43323546479
- Tue Feb 16 17:32:01 1097 PST | 109 | 11 | 2 | 2121779 | -27545092079
- Sat Feb 16 17:32:01 1697 PST | 169 | 17 | 2 | 2340925 | -8610877679
- Thu Feb 16 17:32:01 1797 PST | 179 | 18 | 2 | 2377449 | -5455204079
+ Tue Feb 16 17:32:01 0097 LMT BC | -10 | -1 | -1 | 1686043 | -65192682901
+ Sat Feb 16 17:32:01 0097 LMT | 9 | 1 | 1 | 1756537 | -59102001301
+ Thu Feb 16 17:32:01 0597 LMT | 59 | 6 | 1 | 1939158 | -43323546901
+ Tue Feb 16 17:32:01 1097 LMT | 109 | 11 | 2 | 2121779 | -27545092501
+ Sat Feb 16 17:32:01 1697 LMT | 169 | 17 | 2 | 2340925 | -8610878101
+ Thu Feb 16 17:32:01 1797 LMT | 179 | 18 | 2 | 2377449 | -5455204501
Tue Feb 16 17:32:01 1897 PST | 189 | 19 | 2 | 2413973 | -2299530479
Sun Feb 16 17:32:01 1997 PST | 199 | 20 | 2 | 2450497 | 856143121
Sat Feb 16 17:32:01 2097 PST | 209 | 21 | 3 | 2487022 | 4011903121
@@ -1184,12 +1184,12 @@ SELECT d1 as timestamptz,
Fri Feb 14 17:32:01 1997 PST | -28800 | -8 | 0
Sat Feb 15 17:32:01 1997 PST | -28800 | -8 | 0
Sun Feb 16 17:32:01 1997 PST | -28800 | -8 | 0
- Tue Feb 16 17:32:01 0097 PST BC | -28800 | -8 | 0
- Sat Feb 16 17:32:01 0097 PST | -28800 | -8 | 0
- Thu Feb 16 17:32:01 0597 PST | -28800 | -8 | 0
- Tue Feb 16 17:32:01 1097 PST | -28800 | -8 | 0
- Sat Feb 16 17:32:01 1697 PST | -28800 | -8 | 0
- Thu Feb 16 17:32:01 1797 PST | -28800 | -8 | 0
+ Tue Feb 16 17:32:01 0097 LMT BC | -28378 | -7 | -52
+ Sat Feb 16 17:32:01 0097 LMT | -28378 | -7 | -52
+ Thu Feb 16 17:32:01 0597 LMT | -28378 | -7 | -52
+ Tue Feb 16 17:32:01 1097 LMT | -28378 | -7 | -52
+ Sat Feb 16 17:32:01 1697 LMT | -28378 | -7 | -52
+ Thu Feb 16 17:32:01 1797 LMT | -28378 | -7 | -52
Tue Feb 16 17:32:01 1897 PST | -28800 | -8 | 0
Sun Feb 16 17:32:01 1997 PST | -28800 | -8 | 0
Sat Feb 16 17:32:01 2097 PST | -28800 | -8 | 0
@@ -1263,12 +1263,12 @@ SELECT d1 as "timestamp",
Fri Feb 14 17:32:01 1997 PST | 1000000 | 1000.000 | 1.000000 | 2450495 | 855970321.000000
Sat Feb 15 17:32:01 1997 PST | 1000000 | 1000.000 | 1.000000 | 2450496 | 856056721.000000
Sun Feb 16 17:32:01 1997 PST | 1000000 | 1000.000 | 1.000000 | 2450497 | 856143121.000000
- Tue Feb 16 17:32:01 0097 PST BC | 1000000 | 1000.000 | 1.000000 | 1686043 | -65192682479.000000
- Sat Feb 16 17:32:01 0097 PST | 1000000 | 1000.000 | 1.000000 | 1756537 | -59102000879.000000
- Thu Feb 16 17:32:01 0597 PST | 1000000 | 1000.000 | 1.000000 | 1939158 | -43323546479.000000
- Tue Feb 16 17:32:01 1097 PST | 1000000 | 1000.000 | 1.000000 | 2121779 | -27545092079.000000
- Sat Feb 16 17:32:01 1697 PST | 1000000 | 1000.000 | 1.000000 | 2340925 | -8610877679.000000
- Thu Feb 16 17:32:01 1797 PST | 1000000 | 1000.000 | 1.000000 | 2377449 | -5455204079.000000
+ Tue Feb 16 17:32:01 0097 LMT BC | 1000000 | 1000.000 | 1.000000 | 1686043 | -65192682901.000000
+ Sat Feb 16 17:32:01 0097 LMT | 1000000 | 1000.000 | 1.000000 | 1756537 | -59102001301.000000
+ Thu Feb 16 17:32:01 0597 LMT | 1000000 | 1000.000 | 1.000000 | 1939158 | -43323546901.000000
+ Tue Feb 16 17:32:01 1097 LMT | 1000000 | 1000.000 | 1.000000 | 2121779 | -27545092501.000000
+ Sat Feb 16 17:32:01 1697 LMT | 1000000 | 1000.000 | 1.000000 | 2340925 | -8610878101.000000
+ Thu Feb 16 17:32:01 1797 LMT | 1000000 | 1000.000 | 1.000000 | 2377449 | -5455204501.000000
Tue Feb 16 17:32:01 1897 PST | 1000000 | 1000.000 | 1.000000 | 2413973 | -2299530479.000000
Sun Feb 16 17:32:01 1997 PST | 1000000 | 1000.000 | 1.000000 | 2450497 | 856143121.000000
Sat Feb 16 17:32:01 2097 PST | 1000000 | 1000.000 | 1.000000 | 2487022 | 4011903121.000000
@@ -2258,7 +2258,7 @@ INSERT INTO TIMESTAMPTZ_TST VALUES(4, '1000000312 23:58:48 IST');
SELECT * FROM TIMESTAMPTZ_TST ORDER BY a;
a | b
---+--------------------------------
- 1 | Wed Mar 12 13:58:48 1000 PST
+ 1 | Wed Mar 12 14:05:50 1000 LMT
2 | Sun Mar 12 14:58:48 10000 PDT
3 | Sun Mar 12 14:58:48 100000 PDT
3 | Sun Mar 12 14:58:48 10000 PDT
@@ -2369,7 +2369,14 @@ SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'EDT');
Wed Dec 10 09:10:10 2008 EST
(1 row)
-SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'PST8PDT');
+SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'FOO8BAR');
+ make_timestamptz
+------------------------------
+ Wed Dec 10 13:10:10 2014 EST
+(1 row)
+
+-- POSIX
+SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'PST8PDT,M3.2.0,M11.1.0');
make_timestamptz
------------------------------
Wed Dec 10 13:10:10 2014 EST
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index e275871e8c49e..3a248c6306b7f 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -625,7 +625,7 @@ initialize_environment(void)
/*
* Set timezone and datestyle for datetime-related tests
*/
- setenv("PGTZ", "PST8PDT", 1);
+ setenv("PGTZ", "America/Los_Angeles", 1);
setenv("PGDATESTYLE", "Postgres, MDY", 1);
/*
diff --git a/src/test/regress/sql/horology.sql b/src/test/regress/sql/horology.sql
index 7d6153a432937..d3a68264d7cc5 100644
--- a/src/test/regress/sql/horology.sql
+++ b/src/test/regress/sql/horology.sql
@@ -1,9 +1,9 @@
--
-- HOROLOGY
--
-SET DateStyle = 'Postgres, MDY';
-SHOW TimeZone; -- Many of these tests depend on the prevailing setting
+SHOW TimeZone; -- Many of these tests depend on the prevailing settings
+SHOW DateStyle;
--
-- Test various input formats
diff --git a/src/test/regress/sql/timestamptz.sql b/src/test/regress/sql/timestamptz.sql
index 875479e4962ce..b493398d5830e 100644
--- a/src/test/regress/sql/timestamptz.sql
+++ b/src/test/regress/sql/timestamptz.sql
@@ -436,7 +436,10 @@ SELECT make_timestamptz(1910, 12, 24, 0, 0, 0, 'Nehwon/Lankhmar');
-- abbreviations
SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'EST');
SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'EDT');
-SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'PST8PDT');
+SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'FOO8BAR');
+
+-- POSIX
+SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'PST8PDT,M3.2.0,M11.1.0');
RESET TimeZone;

4
postgresql15.changes
View File

@ -1,7 +1,9 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 26 11:05:21 UTC 2024 - Reinhard Max <max@suse.com> Tue Nov 5 12:35:17 UTC 2024 - Reinhard Max <max@suse.com>
- Sync spec file from postgresql17. - Sync spec file from postgresql17.
- Pull upstream patch to fix tests with timezone 2024b
* postgresql-testsuite-timezone-fix.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Aug 10 14:11:36 UTC 2024 - Marcus Rueckert <mrueckert@suse.de> Sat Aug 10 14:11:36 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>

11
postgresql15.spec
View File

@ -20,8 +20,9 @@
%define pgmajor 15 %define pgmajor 15
%define buildlibs 0 %define buildlibs 0
%define tarversion %{pgversion} %define tarversion %{pgversion}
%define oldest_supported_llvm_ver 7 %define oldest_supported_llvm_ver 10
%define latest_supported_llvm_ver 18 # To be able to use cmake(LLVM) < ...
%define latest_supported_llvm_ver_plus_one 19
### CUT HERE ### ### CUT HERE ###
%define pgname postgresql%pgmajor %define pgname postgresql%pgmajor
@ -145,8 +146,8 @@ BuildRequires: libselinux-devel
%endif %endif
%if %{with llvm} %if %{with llvm}
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: (cmake(Clang) >= %{oldest_supported_llvm_ver} with cmake(Clang) <= %{latest_supported_llvm_ver}) BuildRequires: (cmake(Clang) >= %{oldest_supported_llvm_ver} with cmake(Clang) < %{latest_supported_llvm_ver_plus_one})
BuildRequires: (cmake(LLVM) >= %{oldest_supported_llvm_ver} with cmake(LLVM) <= %{latest_supported_llvm_ver}) BuildRequires: (cmake(LLVM) >= %{oldest_supported_llvm_ver} with cmake(LLVM) < %{latest_supported_llvm_ver_plus_one})
%endif %endif
BuildRequires: libxslt-devel BuildRequires: libxslt-devel
BuildRequires: openldap2-devel BuildRequires: openldap2-devel
@ -189,6 +190,7 @@ Patch9: postgresql-var-run-socket.patch
Patch10: postgresql-llvm-optional.patch Patch10: postgresql-llvm-optional.patch
Patch11: 0001-jit-Workaround-potential-datalayout-mismatch-on-s390.patch Patch11: 0001-jit-Workaround-potential-datalayout-mismatch-on-s390.patch
%endif %endif
Patch12: postgresql-testsuite-timezone-fix.patch
URL: https://www.postgresql.org/ URL: https://www.postgresql.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: postgresql = %version-%release Provides: postgresql = %version-%release
@ -523,6 +525,7 @@ touch -r configure tmp
%patch -P 10 %patch -P 10
%patch -P 11 %patch -P 11
%endif %endif
%patch -P 12 -p 1
touch -r tmp configure touch -r tmp configure
rm tmp rm tmp
find src/test/ -name '*.orig' -delete find src/test/ -name '*.orig' -delete