1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix name collision between concurrent regression tests.

Browse Source 
Commit f5bcd398addcbeb785f0513cf28cba5d1ecd2c8a 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.
This commit is contained in:
Tom Lane 2012-07-22 00:01:26 -04:00
parent 641054ad78
commit d86fb72c5c
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/test/regress/expected/inherit.out
View File

@ -1009,41 +1009,41 @@ Has OIDs: no
DROP TABLE test_constraints_inh; DROP TABLE test_constraints_inh;
DROP TABLE test_constraints; DROP TABLE test_constraints;
CREATE TABLE circles ( CREATE TABLE test_ex_constraints (
c circle, c circle,
EXCLUDE USING gist (c WITH &&) EXCLUDE USING gist (c WITH &&)
); );
NOTICE: CREATE TABLE / EXCLUDE will create implicit index "circles_c_excl" for table "circles" NOTICE: CREATE TABLE / EXCLUDE will create implicit index "test_ex_constraints_c_excl" for table "test_ex_constraints"
CREATE TABLE circles_inh () INHERITS (circles); CREATE TABLE test_ex_constraints_inh () INHERITS (test_ex_constraints);
\d+ circles \d+ test_ex_constraints
Table "public.circles" Table "public.test_ex_constraints"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Modifiers | Storage | Stats target | Description
--------+--------+-----------+---------+--------------+------------- --------+--------+-----------+---------+--------------+-------------
c | circle | | plain | | c | circle | | plain | |
Indexes: Indexes:
"circles_c_excl" EXCLUDE USING gist (c WITH &&) "test_ex_constraints_c_excl" EXCLUDE USING gist (c WITH &&)
Child tables: circles_inh Child tables: test_ex_constraints_inh
Has OIDs: no Has OIDs: no
ALTER TABLE circles DROP CONSTRAINT circles_c_excl; ALTER TABLE test_ex_constraints DROP CONSTRAINT test_ex_constraints_c_excl;
\d+ circles \d+ test_ex_constraints
Table "public.circles" Table "public.test_ex_constraints"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Modifiers | Storage | Stats target | Description
--------+--------+-----------+---------+--------------+------------- --------+--------+-----------+---------+--------------+-------------
c | circle | | plain | | c | circle | | plain | |
Child tables: circles_inh Child tables: test_ex_constraints_inh
Has OIDs: no Has OIDs: no
\d+ circles_inh \d+ test_ex_constraints_inh
Table "public.circles_inh" Table "public.test_ex_constraints_inh"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Modifiers | Storage | Stats target | Description
--------+--------+-----------+---------+--------------+------------- --------+--------+-----------+---------+--------------+-------------
c | circle | | plain | | c | circle | | plain | |
Inherits: circles Inherits: test_ex_constraints
Has OIDs: no Has OIDs: no
DROP TABLE circles_inh; DROP TABLE test_ex_constraints_inh;
DROP TABLE circles; DROP TABLE test_ex_constraints;
-- Test non-inheritable foreign key contraints -- Test non-inheritable foreign key contraints
CREATE TABLE test_primary_constraints(id int PRIMARY KEY); CREATE TABLE test_primary_constraints(id int PRIMARY KEY);
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "test_primary_constraints_pkey" for table "test_primary_constraints" NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "test_primary_constraints_pkey" for table "test_primary_constraints"

16
src/test/regress/sql/inherit.sql
View File

@ -302,17 +302,17 @@ ALTER TABLE ONLY test_constraints DROP CONSTRAINT test_constraints_val1_val2_key
DROP TABLE test_constraints_inh; DROP TABLE test_constraints_inh;
DROP TABLE test_constraints; DROP TABLE test_constraints;
CREATE TABLE circles ( CREATE TABLE test_ex_constraints (
c circle, c circle,
EXCLUDE USING gist (c WITH &&) EXCLUDE USING gist (c WITH &&)
); );
CREATE TABLE circles_inh () INHERITS (circles); CREATE TABLE test_ex_constraints_inh () INHERITS (test_ex_constraints);
\d+ circles \d+ test_ex_constraints
ALTER TABLE circles DROP CONSTRAINT circles_c_excl; ALTER TABLE test_ex_constraints DROP CONSTRAINT test_ex_constraints_c_excl;
\d+ circles \d+ test_ex_constraints
\d+ circles_inh \d+ test_ex_constraints_inh
DROP TABLE circles_inh; DROP TABLE test_ex_constraints_inh;
DROP TABLE circles; DROP TABLE test_ex_constraints;
-- Test non-inheritable foreign key contraints -- Test non-inheritable foreign key contraints
CREATE TABLE test_primary_constraints(id int PRIMARY KEY); CREATE TABLE test_primary_constraints(id int PRIMARY KEY);