Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 184951a

Browse files
committed
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
1 parent 3d05965 commit 184951a

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

src/test/regress/expected/horology.out

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3164,3 +3164,10 @@ SELECT to_char('2012-12-12 12:00'::timestamptz, 'YYYY-MM-DD HH:MI:SS TZ');
31643164
(1 row)
31653165

31663166
RESET TIME ZONE;
3167+
--
3168+
-- Drop tables that we don't want to keep because they interfere with
3169+
-- testing pg_upgrade to v12 and up
3170+
--
3171+
DROP TABLE abstime_tbl;
3172+
DROP TABLE reltime_tbl;
3173+
DROP TABLE tinterval_tbl;

src/test/regress/expected/sanity_check.out

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ SELECT relname, relhasindex
1313
ORDER BY relname;
1414
a|f
1515
a_star|f
16-
abstime_tbl|f
1716
aggtest|f
1817
array_index_op_test|t
1918
array_op_test|f
@@ -174,7 +173,6 @@ quad_poly_tbl_ord_seq2|f
174173
radix_text_tbl|t
175174
ramp|f
176175
real_city|f
177-
reltime_tbl|f
178176
road|t
179177
shighway|t
180178
slow_emp4000|f
@@ -205,7 +203,6 @@ time_tbl|f
205203
timestamp_tbl|f
206204
timestamptz_tbl|f
207205
timetz_tbl|f
208-
tinterval_tbl|f
209206
varchar_tbl|f
210207
-- restore normal output mode
211208
\a\t

src/test/regress/sql/horology.sql

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,3 +531,12 @@ SELECT '2012-12-12 12:00 America/New_York'::timestamptz;
531531
SELECT to_char('2012-12-12 12:00'::timestamptz, 'YYYY-MM-DD HH:MI:SS TZ');
532532

533533
RESET TIME ZONE;
534+
535+
--
536+
-- Drop tables that we don't want to keep because they interfere with
537+
-- testing pg_upgrade to v12 and up
538+
--
539+
540+
DROP TABLE abstime_tbl;
541+
DROP TABLE reltime_tbl;
542+
DROP TABLE tinterval_tbl;

0 commit comments

Comments
 (0)