From 12dedfea4007f28208396c148718aa2be6a626c25347f4e21291fa900b5cb30a Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Tue, 5 Nov 2024 12:32:39 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/server:database:postgresql/postgresql16?expand=0&rev=38

---
 postgresql-testsuite-timezone-fix.patch | 56 +++++++++++++++++++++----
 1 file changed, 47 insertions(+), 9 deletions(-)

diff --git a/postgresql-testsuite-timezone-fix.patch b/postgresql-testsuite-timezone-fix.patch
index 60e387b..eea8e05 100644
--- a/postgresql-testsuite-timezone-fix.patch
+++ b/postgresql-testsuite-timezone-fix.patch
@@ -28,8 +28,49 @@ Discussion: https://postgr.es/m/0a997455-5aba-4cf2-a354-d26d8bcbfae6@technowledg
  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 69f627d7f4310..6cb08f7ca825e 100644
+--- a/doc/src/sgml/regress.sgml
++++ b/doc/src/sgml/regress.sgml
+@@ -534,11 +534,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 f5949f3d17..20374c5230 100644
+index f5949f3d174dd..20374c5230a7c 100644
 --- a/src/test/regress/expected/date.out
 +++ b/src/test/regress/expected/date.out
 @@ -1295,7 +1295,7 @@ SELECT DATE_TRUNC('MILLENNIUM', TIMESTAMP '1970-03-20 04:30:00.00000'); -- 1001
@@ -74,7 +115,7 @@ index f5949f3d17..20374c5230 100644
  
  --
 diff --git a/src/test/regress/expected/horology.out b/src/test/regress/expected/horology.out
-index 31d269b7ba..0681f84d5f 100644
+index 31d269b7ba638..0681f84d5ffe2 100644
 --- a/src/test/regress/expected/horology.out
 +++ b/src/test/regress/expected/horology.out
 @@ -1,11 +1,16 @@
@@ -213,7 +254,7 @@ index 31d269b7ba..0681f84d5f 100644
  
  --
 diff --git a/src/test/regress/expected/timestamptz.out b/src/test/regress/expected/timestamptz.out
-index db56fcfb0e..e7ac12aafa 100644
+index db56fcfb0e7a5..e7ac12aafa4ae 100644
 --- a/src/test/regress/expected/timestamptz.out
 +++ b/src/test/regress/expected/timestamptz.out
 @@ -330,12 +330,12 @@ SELECT d1 FROM TIMESTAMPTZ_TBL;
@@ -455,7 +496,7 @@ index db56fcfb0e..e7ac12aafa 100644
  ------------------------------
   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 57aa0de3b7..e3a0267d5e 100644
+index 57aa0de3b7adf..e3a0267d5e08b 100644
 --- a/src/test/regress/pg_regress.c
 +++ b/src/test/regress/pg_regress.c
 @@ -761,7 +761,7 @@ initialize_environment(void)
@@ -468,7 +509,7 @@ index 57aa0de3b7..e3a0267d5e 100644
  
  	/*
 diff --git a/src/test/regress/sql/horology.sql b/src/test/regress/sql/horology.sql
-index 8f6c513573..fdd70a0767 100644
+index 8f6c513573d1b..fdd70a07670b5 100644
 --- a/src/test/regress/sql/horology.sql
 +++ b/src/test/regress/sql/horology.sql
 @@ -1,9 +1,9 @@
@@ -484,7 +525,7 @@ index 8f6c513573..fdd70a0767 100644
  --
  -- Test various input formats
 diff --git a/src/test/regress/sql/timestamptz.sql b/src/test/regress/sql/timestamptz.sql
-index 60cd84172c..64bba0817e 100644
+index 60cd84172c5b3..64bba0817e946 100644
 --- a/src/test/regress/sql/timestamptz.sql
 +++ b/src/test/regress/sql/timestamptz.sql
 @@ -449,7 +449,10 @@ SELECT make_timestamptz(1910, 12, 24, 0, 0, 0, 'Nehwon/Lankhmar');
@@ -499,6 +540,3 @@ index 60cd84172c..64bba0817e 100644
  
  RESET TimeZone;
  
--- 
-2.30.2
-