Alter the previous test for "time with time zone" implicit time zone

 (which failed miserably during DST) to just compare against a time
 derived from a timestamp value.
Certainly not a direct check for a correct result, but should work
 at any time of year.

4 files changed, 52 insertions, 2 deletions

diff --git a/src/test/regress/expected/horology-no-DST-before-1970.out b/src/test/regress/expected/horology-no-DST-before-1970.out
index 6adc5d9ef6d..18ca744d785 100644
--- a/src/test/regress/expected/horology-no-DST-before-1970.out
+++ b/src/test/regress/expected/horology-no-DST-before-1970.out
@@ -135,6 +135,21 @@ SELECT time with time zone '02:30-08' + interval '36:01' AS "14:31:00-08";
 -- which may be either -08 or -07 depending on the time of year.
 -- SELECT time with time zone '01:30' + interval '02:01' AS "03:31:00-08";
 -- SELECT time with time zone '03:30' + interval '1 month 04:01' AS "07:31:00-08";
+-- Try the following two tests instead, as a poor substitute
+SELECT CAST(date 'today' + time with time zone '01:30'
+            + interval '02:01' AS time) AS "03:31:00";
+ 03:31:00 
+----------
+ 03:31:00
+(1 row)
+
+SELECT CAST(date 'today' + time with time zone '03:30'
+            + interval '1 month 04:01' AS time) AS "07:31:00";
+ 07:31:00 
+----------
+ 07:31:00
+(1 row)
+
 SELECT interval '04:30' - time with time zone '01:02' AS "+03:28";
 ERROR:  Unable to identify an operator '-' for types 'interval' and 'timetz'
 	You will have to retype this query using an explicit cast
diff --git a/src/test/regress/expected/horology-solaris-1947.out b/src/test/regress/expected/horology-solaris-1947.out
index dad40d14956..451c6a6c765 100644
--- a/src/test/regress/expected/horology-solaris-1947.out
+++ b/src/test/regress/expected/horology-solaris-1947.out
@@ -135,6 +135,21 @@ SELECT time with time zone '02:30-08' + interval '36:01' AS "14:31:00-08";
 -- which may be either -08 or -07 depending on the time of year.
 -- SELECT time with time zone '01:30' + interval '02:01' AS "03:31:00-08";
 -- SELECT time with time zone '03:30' + interval '1 month 04:01' AS "07:31:00-08";
+-- Try the following two tests instead, as a poor substitute
+SELECT CAST(date 'today' + time with time zone '01:30'
+            + interval '02:01' AS time) AS "03:31:00";
+ 03:31:00 
+----------
+ 03:31:00
+(1 row)
+
+SELECT CAST(date 'today' + time with time zone '03:30'
+            + interval '1 month 04:01' AS time) AS "07:31:00";
+ 07:31:00 
+----------
+ 07:31:00
+(1 row)
+
 SELECT interval '04:30' - time with time zone '01:02' AS "+03:28";
 ERROR:  Unable to identify an operator '-' for types 'interval' and 'timetz'
 	You will have to retype this query using an explicit cast
diff --git a/src/test/regress/expected/horology.out b/src/test/regress/expected/horology.out
index 0e39d5e9535..dc16d58dea9 100644
--- a/src/test/regress/expected/horology.out
+++ b/src/test/regress/expected/horology.out
@@ -135,6 +135,21 @@ SELECT time with time zone '02:30-08' + interval '36:01' AS "14:31:00-08";
 -- which may be either -08 or -07 depending on the time of year.
 -- SELECT time with time zone '01:30' + interval '02:01' AS "03:31:00-08";
 -- SELECT time with time zone '03:30' + interval '1 month 04:01' AS "07:31:00-08";
+-- Try the following two tests instead, as a poor substitute
+SELECT CAST(date 'today' + time with time zone '01:30'
+            + interval '02:01' AS time) AS "03:31:00";
+ 03:31:00 
+----------
+ 03:31:00
+(1 row)
+
+SELECT CAST(date 'today' + time with time zone '03:30'
+            + interval '1 month 04:01' AS time) AS "07:31:00";
+ 07:31:00 
+----------
+ 07:31:00
+(1 row)
+
 SELECT interval '04:30' - time with time zone '01:02' AS "+03:28";
 ERROR:  Unable to identify an operator '-' for types 'interval' and 'timetz'
 	You will have to retype this query using an explicit cast
diff --git a/src/test/regress/sql/horology.sql b/src/test/regress/sql/horology.sql
index 0ad1d9cd300..2350064d839 100644
--- a/src/test/regress/sql/horology.sql
+++ b/src/test/regress/sql/horology.sql
@@ -60,10 +60,15 @@ SELECT time with time zone '02:30-08' + interval '36:01' AS "14:31:00-08";
 
 -- These two tests cannot be used because they default to current timezone,
 -- which may be either -08 or -07 depending on the time of year.
-
 -- SELECT time with time zone '01:30' + interval '02:01' AS "03:31:00-08";
-
 -- SELECT time with time zone '03:30' + interval '1 month 04:01' AS "07:31:00-08";
+-- Try the following two tests instead, as a poor substitute
+
+SELECT CAST(date 'today' + time with time zone '01:30'
+            + interval '02:01' AS time) AS "03:31:00";
+
+SELECT CAST(date 'today' + time with time zone '03:30'
+            + interval '1 month 04:01' AS time) AS "07:31:00";
 
 SELECT interval '04:30' - time with time zone '01:02' AS "+03:28";