diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2018-10-12 19:33:56 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2018-10-12 19:33:56 -0400 |
| commit | 184951a48a107c7e1f128f7fa3887fbd216d6d60 (patch) | |
| tree | 6b4253eaac8873f29fd1b5fac97e7135134dccf1 /src | |
| parent | 3d059655be7dfcb7124c6b3ce0925448de89f669 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/regress/expected/horology.out | 7 | ||||
| -rw-r--r-- | src/test/regress/expected/sanity_check.out | 3 | ||||
| -rw-r--r-- | 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 63e39198e68..45843e38553 100644 --- a/src/test/regress/expected/horology.out +++ b/src/test/regress/expected/horology.out @@ -3164,3 +3164,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 48e0508a96b..9c7a60c092d 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 @@ -174,7 +173,6 @@ quad_poly_tbl_ord_seq2|f radix_text_tbl|t ramp|f real_city|f -reltime_tbl|f road|t shighway|t slow_emp4000|f @@ -205,7 +203,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 ebb196a1cfc..c6822e6c1b7 100644 --- a/src/test/regress/sql/horology.sql +++ b/src/test/regress/sql/horology.sql @@ -531,3 +531,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; |