postgres.git / summary / log / commit / refs

commit    9320263ae7cac206c2e82e00e42dbcddce4e8dfb
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Fri Oct 12 23:33:56 2018 +0000
First released in: 9.3.25, 9.4.20, 9.5.15, 9.6.11, 10.6, 11.0

    Remove abstime, reltime, tinterval tables from old regression databases.
    
    In the back branches, drop these tables after the regression tests are
    done with them.  This fixes failures of cross-branch pg_upgrade testing
    caused by these types having been removed in v12.  We do lose the ability
    to test dump/restore behavior with these types in the back branches, but
    the actual loss of code coverage seems to be nil given that there's nothing
    very special about these types.
    
    Discussion: https://postgr.es/m/20181009192237.34wjp3nmw7oynmmr@alap3.anarazel.de


 src/test/regress/expected/horology.out     | 7 +++++++
 src/test/regress/expected/sanity_check.out | 3 ---
 src/test/regress/sql/horology.sql          | 9 +++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/test/regress/expected/horology.out b/src/test/regress/expected/horology.out
index f9d12e0f8a3..6cc6a90474c 100644
--- a/src/test/regress/expected/horology.out
+++ b/src/test/regress/expected/horology.out
@@ -3134,3 +3134,10 @@ SELECT to_char('2012-12-12 12:00'::timestamptz, 'YYYY-MM-DD HH:MI:SS TZ');
 (1 row)
 
 RESET TIME ZONE;
+--
+-- Drop tables that we don't want to keep because they interfere with
+-- testing pg_upgrade to v12 and up
+--
+DROP TABLE abstime_tbl;
+DROP TABLE reltime_tbl;
+DROP TABLE tinterval_tbl;
diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out
index 6750152e0f4..8d2b449f408 100644
--- a/src/test/regress/expected/sanity_check.out
+++ b/src/test/regress/expected/sanity_check.out
@@ -13,7 +13,6 @@ SELECT relname, relhasindex
    ORDER BY relname;
 a|f
 a_star|f
-abstime_tbl|f
 aggtest|f
 array_index_op_test|t
 array_op_test|f
@@ -165,7 +164,6 @@ quad_point_tbl|t
 radix_text_tbl|t
 ramp|f
 real_city|f
-reltime_tbl|f
 road|t
 shighway|t
 slow_emp4000|f
@@ -190,7 +188,6 @@ time_tbl|f
 timestamp_tbl|f
 timestamptz_tbl|f
 timetz_tbl|f
-tinterval_tbl|f
 varchar_tbl|f
 -- restore normal output mode
 \a\t
diff --git a/src/test/regress/sql/horology.sql b/src/test/regress/sql/horology.sql
index a7bc9dcfc4f..0dc980a80a3 100644
--- a/src/test/regress/sql/horology.sql
+++ b/src/test/regress/sql/horology.sql
@@ -525,3 +525,12 @@ SELECT '2012-12-12 12:00 America/New_York'::timestamptz;
 SELECT to_char('2012-12-12 12:00'::timestamptz, 'YYYY-MM-DD HH:MI:SS TZ');
 
 RESET TIME ZONE;
+
+--
+-- Drop tables that we don't want to keep because they interfere with
+-- testing pg_upgrade to v12 and up
+--
+
+DROP TABLE abstime_tbl;
+DROP TABLE reltime_tbl;
+DROP TABLE tinterval_tbl;


[parent: 532e3b5b3dd2]