Fix table name clash in recently introduced test

anarazel · anarazel · commit 728015a47016 · 2023-04-07T14:02:46.000-07:00
A few buildfarm animals recently started complaining about the "child" relation already existing. e056c55 added a new child table to inherit.sql, but triggers.sql, running in the same parallel group, also uses a child table. Rename the new table to inh_child. It maybe worth renaming child, parent in other tests as well, but that's work for another day. Discussion: https://postgr.es/m/20230407204530.52q3v5cu5x6dj676@awork3.anarazel.de
diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out
@@ -2185,23 +2185,23 @@ drop cascades to table d1
 -- with explicitly specified not null constraints
 create table inh_parent_1(f1 int);
 create table inh_parent_2(f2 text);
-create table child(f1 int not null, f2 text not null) inherits(inh_parent_1, inh_parent_2);
+create table inh_child(f1 int not null, f2 text not null) inherits(inh_parent_1, inh_parent_2);
 NOTICE:  merging column "f1" with inherited definition
 NOTICE:  merging column "f2" with inherited definition
 -- show constraint info
 select conrelid::regclass, conname, contype, coninhcount, conislocal
  from pg_constraint where contype = 'n' and
- conrelid in ('inh_parent_1'::regclass, 'inh_parent_2'::regclass, 'child'::regclass)
+ conrelid in ('inh_parent_1'::regclass, 'inh_parent_2'::regclass, 'inh_child'::regclass)
  order by 2, 1;
- conrelid |      conname      | contype | coninhcount | conislocal 
-----------+-------------------+---------+-------------+------------
- child    | child_f1_not_null | n       |           0 | t
- child    | child_f2_not_null | n       |           0 | t
+ conrelid  |        conname        | contype | coninhcount | conislocal 
+-----------+-----------------------+---------+-------------+------------
+ inh_child | inh_child_f1_not_null | n       |           0 | t
+ inh_child | inh_child_f2_not_null | n       |           0 | t
 (2 rows)
 
--- also drops child table
+-- also drops inh_child table
 drop table inh_parent_1 cascade;
-NOTICE:  drop cascades to table child
+NOTICE:  drop cascades to table inh_child
 drop table inh_parent_2;
 -- test multi layer inheritance tree
 create table inh_p1(f1 int not null);
diff --git a/src/test/regress/sql/inherit.sql b/src/test/regress/sql/inherit.sql
@@ -848,15 +848,15 @@ drop table inh_parent cascade;
 -- with explicitly specified not null constraints
 create table inh_parent_1(f1 int);
 create table inh_parent_2(f2 text);
-create table child(f1 int not null, f2 text not null) inherits(inh_parent_1, inh_parent_2);
+create table inh_child(f1 int not null, f2 text not null) inherits(inh_parent_1, inh_parent_2);
 
 -- show constraint info
 select conrelid::regclass, conname, contype, coninhcount, conislocal
  from pg_constraint where contype = 'n' and
- conrelid in ('inh_parent_1'::regclass, 'inh_parent_2'::regclass, 'child'::regclass)
+ conrelid in ('inh_parent_1'::regclass, 'inh_parent_2'::regclass, 'inh_child'::regclass)
  order by 2, 1;
 
--- also drops child table
+-- also drops inh_child table
 drop table inh_parent_1 cascade;
 drop table inh_parent_2;
 
