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

Commit b71258a

Browse files
committed
Fix name collision between concurrent regression tests.
Commit f5bcd39 introduced a test using a table named "circles" in inherit.sql. Unfortunately, the concurrently executed constraints test was already using that table name, so the parallel regression tests would sometimes fail. Rename table to dodge the problem. Per buildfarm.
1 parent 2d46a57 commit b71258a

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

src/test/regress/expected/inherit.out

+15-15
Original file line numberDiff line numberDiff line change
@@ -1007,40 +1007,40 @@ Has OIDs: no
10071007

10081008
DROP TABLE test_constraints_inh;
10091009
DROP TABLE test_constraints;
1010-
CREATE TABLE circles (
1010+
CREATE TABLE test_ex_constraints (
10111011
c circle,
10121012
EXCLUDE USING gist (c WITH &&)
10131013
);
1014-
CREATE TABLE circles_inh () INHERITS (circles);
1015-
\d+ circles
1016-
Table "public.circles"
1014+
CREATE TABLE test_ex_constraints_inh () INHERITS (test_ex_constraints);
1015+
\d+ test_ex_constraints
1016+
Table "public.test_ex_constraints"
10171017
Column | Type | Modifiers | Storage | Stats target | Description
10181018
--------+--------+-----------+---------+--------------+-------------
10191019
c | circle | | plain | |
10201020
Indexes:
1021-
"circles_c_excl" EXCLUDE USING gist (c WITH &&)
1022-
Child tables: circles_inh
1021+
"test_ex_constraints_c_excl" EXCLUDE USING gist (c WITH &&)
1022+
Child tables: test_ex_constraints_inh
10231023
Has OIDs: no
10241024

1025-
ALTER TABLE circles DROP CONSTRAINT circles_c_excl;
1026-
\d+ circles
1027-
Table "public.circles"
1025+
ALTER TABLE test_ex_constraints DROP CONSTRAINT test_ex_constraints_c_excl;
1026+
\d+ test_ex_constraints
1027+
Table "public.test_ex_constraints"
10281028
Column | Type | Modifiers | Storage | Stats target | Description
10291029
--------+--------+-----------+---------+--------------+-------------
10301030
c | circle | | plain | |
1031-
Child tables: circles_inh
1031+
Child tables: test_ex_constraints_inh
10321032
Has OIDs: no
10331033

1034-
\d+ circles_inh
1035-
Table "public.circles_inh"
1034+
\d+ test_ex_constraints_inh
1035+
Table "public.test_ex_constraints_inh"
10361036
Column | Type | Modifiers | Storage | Stats target | Description
10371037
--------+--------+-----------+---------+--------------+-------------
10381038
c | circle | | plain | |
1039-
Inherits: circles
1039+
Inherits: test_ex_constraints
10401040
Has OIDs: no
10411041

1042-
DROP TABLE circles_inh;
1043-
DROP TABLE circles;
1042+
DROP TABLE test_ex_constraints_inh;
1043+
DROP TABLE test_ex_constraints;
10441044
-- Test non-inheritable foreign key contraints
10451045
CREATE TABLE test_primary_constraints(id int PRIMARY KEY);
10461046
CREATE TABLE test_foreign_constraints(id1 int REFERENCES test_primary_constraints(id));

src/test/regress/sql/inherit.sql

+8-8
Original file line numberDiff line numberDiff line change
@@ -302,17 +302,17 @@ ALTER TABLE ONLY test_constraints DROP CONSTRAINT test_constraints_val1_val2_key
302302
DROP TABLE test_constraints_inh;
303303
DROP TABLE test_constraints;
304304

305-
CREATE TABLE circles (
305+
CREATE TABLE test_ex_constraints (
306306
c circle,
307307
EXCLUDE USING gist (c WITH &&)
308308
);
309-
CREATE TABLE circles_inh () INHERITS (circles);
310-
\d+ circles
311-
ALTER TABLE circles DROP CONSTRAINT circles_c_excl;
312-
\d+ circles
313-
\d+ circles_inh
314-
DROP TABLE circles_inh;
315-
DROP TABLE circles;
309+
CREATE TABLE test_ex_constraints_inh () INHERITS (test_ex_constraints);
310+
\d+ test_ex_constraints
311+
ALTER TABLE test_ex_constraints DROP CONSTRAINT test_ex_constraints_c_excl;
312+
\d+ test_ex_constraints
313+
\d+ test_ex_constraints_inh
314+
DROP TABLE test_ex_constraints_inh;
315+
DROP TABLE test_ex_constraints;
316316

317317
-- Test non-inheritable foreign key contraints
318318
CREATE TABLE test_primary_constraints(id int PRIMARY KEY);

0 commit comments

Comments
 (0)