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

diff --git a/src/test/regress/expected/horology.out b/src/test/regress/expected/horology.out
index 2666deea88bd9838f48f2037378d31bc1b26f8fe..fb12b00f71a1cfefece358034668b48fa4e822c8 100644 (file)
--- a/src/test/regress/expected/horology.out
+++ b/src/test/regress/expected/horology.out
@@ -2965,3 +2965,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 66c21e8c174c27cd18c50e155a55cc5bb0eb519c..56bfed40dd13761570b88b4d429c4d8b7c76b734 100644 (file)
--- a/src/test/regress/expected/sanity_check.out
+++ b/src/test/regress/expected/sanity_check.out
@@ -13,7 +13,6 @@ SELECT relname, relhasindex
 -------------------------+-------------
  a                       | f
  a_star                  | f
- abstime_tbl             | f
  aggtest                 | f
  array_index_op_test     | t
  array_op_test           | f
@@ -142,7 +141,6 @@ SELECT relname, relhasindex
  radix_text_tbl          | t
  ramp                    | f
  real_city               | f
- reltime_tbl             | f
  road                    | t
  shighway                | t
  slow_emp4000            | f
@@ -166,9 +164,8 @@ SELECT relname, relhasindex
  timestamp_tbl           | f
  timestamptz_tbl         | f
  timetz_tbl              | f
- tinterval_tbl           | f
  varchar_tbl             | f
-(157 rows)
+(154 rows)
 
 --
 -- another sanity check: every system catalog that has OIDs should have

diff --git a/src/test/regress/sql/horology.sql b/src/test/regress/sql/horology.sql
index fe9a520cb91437638c6cf50f5ccd1a47607aae0b..c95c9f85a0dcedaca8a9c7ff53ad1a854d75400e 100644 (file)
--- a/src/test/regress/sql/horology.sql
+++ b/src/test/regress/sql/horology.sql
@@ -477,3 +477,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;