Fix name collision between concurrent regression tests.

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.

diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out
index 1b89859d2821309c9245addbd3e9d615ed0dd706..c178e256078ff16e8d3b1e3da0b99da33bc14af8 100644 (file)
--- a/src/test/regress/expected/inherit.out
+++ b/src/test/regress/expected/inherit.out
@@ -1007,40 +1007,40 @@ Has OIDs: no
 
 DROP TABLE test_constraints_inh;
 DROP TABLE test_constraints;
-CREATE TABLE circles (
+CREATE TABLE test_ex_constraints (
     c circle,
     EXCLUDE USING gist (c WITH &&)
 );
-CREATE TABLE circles_inh () INHERITS (circles);
-\d+ circles
-                       Table "public.circles"
+CREATE TABLE test_ex_constraints_inh () INHERITS (test_ex_constraints);
+\d+ test_ex_constraints
+                 Table "public.test_ex_constraints"
  Column |  Type  | Modifiers | Storage | Stats target | Description 
 --------+--------+-----------+---------+--------------+-------------
  c      | circle |           | plain   |              | 
 Indexes:
-    "circles_c_excl" EXCLUDE USING gist (c WITH &&)
-Child tables: circles_inh
+    "test_ex_constraints_c_excl" EXCLUDE USING gist (c WITH &&)
+Child tables: test_ex_constraints_inh
 Has OIDs: no
 
-ALTER TABLE circles DROP CONSTRAINT circles_c_excl;
-\d+ circles
-                       Table "public.circles"
+ALTER TABLE test_ex_constraints DROP CONSTRAINT test_ex_constraints_c_excl;
+\d+ test_ex_constraints
+                 Table "public.test_ex_constraints"
  Column |  Type  | Modifiers | Storage | Stats target | Description 
 --------+--------+-----------+---------+--------------+-------------
  c      | circle |           | plain   |              | 
-Child tables: circles_inh
+Child tables: test_ex_constraints_inh
 Has OIDs: no
 
-\d+ circles_inh
-                     Table "public.circles_inh"
+\d+ test_ex_constraints_inh
+               Table "public.test_ex_constraints_inh"
  Column |  Type  | Modifiers | Storage | Stats target | Description 
 --------+--------+-----------+---------+--------------+-------------
  c      | circle |           | plain   |              | 
-Inherits: circles
+Inherits: test_ex_constraints
 Has OIDs: no
 
-DROP TABLE circles_inh;
-DROP TABLE circles;
+DROP TABLE test_ex_constraints_inh;
+DROP TABLE test_ex_constraints;
 -- Test non-inheritable foreign key contraints
 CREATE TABLE test_primary_constraints(id int PRIMARY KEY);
 CREATE TABLE test_foreign_constraints(id1 int REFERENCES test_primary_constraints(id));

diff --git a/src/test/regress/sql/inherit.sql b/src/test/regress/sql/inherit.sql
index 5f607603252af530e33d34789cd59b5d9442d078..74cb3f09e8573f399f7d79cf74ebe0ad141a2e32 100644 (file)
--- a/src/test/regress/sql/inherit.sql
+++ b/src/test/regress/sql/inherit.sql
@@ -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;
 
-CREATE TABLE circles (
+CREATE TABLE test_ex_constraints (
     c circle,
     EXCLUDE USING gist (c WITH &&)
 );
-CREATE TABLE circles_inh () INHERITS (circles);
-\d+ circles
-ALTER TABLE circles DROP CONSTRAINT circles_c_excl;
-\d+ circles
-\d+ circles_inh
-DROP TABLE circles_inh;
-DROP TABLE circles;
+CREATE TABLE test_ex_constraints_inh () INHERITS (test_ex_constraints);
+\d+ test_ex_constraints
+ALTER TABLE test_ex_constraints DROP CONSTRAINT test_ex_constraints_c_excl;
+\d+ test_ex_constraints
+\d+ test_ex_constraints_inh
+DROP TABLE test_ex_constraints_inh;
+DROP TABLE test_ex_constraints;
 
 -- Test non-inheritable foreign key contraints
 CREATE TABLE test_primary_constraints(id int PRIMARY KEY);