From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 21 Feb 2017 17:18:22 +0000 (-0500)
Subject: Use less-generic table name in new regression test case.
X-Git-Tag: REL_10_BETA1~858
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c95f0b478a91b58391720dcda35bc032e582564;p=thirdparty%2Fpostgresql.git

Use less-generic table name in new regression test case.

Creating global objects named "foo" isn't an especially wise thing,
but especially not in a test script that has already used that name
for something else, and most especially not in a script that runs
in parallel with other scripts that use that name :-(

Per buildfarm.
---

diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index e84af67fb22..9885fcba89c 100644
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -3034,18 +3034,18 @@ CREATE TABLE list_partitioned (a int not null) partition by list (a);
 ALTER TABLE list_partitioned ALTER a DROP NOT NULL;
 DROP TABLE list_partitioned;
 -- partitioned table cannot participate in regular inheritance
-CREATE TABLE foo (
+CREATE TABLE nonpartitioned (
 	a int,
 	b int
 );
-ALTER TABLE partitioned INHERIT foo;
+ALTER TABLE partitioned INHERIT nonpartitioned;
 ERROR:  cannot change inheritance of partitioned table
-ALTER TABLE foo INHERIT partitioned;
+ALTER TABLE nonpartitioned INHERIT partitioned;
 ERROR:  cannot inherit from partitioned table "partitioned"
 -- cannot add NO INHERIT constraint to partitioned tables
 ALTER TABLE partitioned ADD CONSTRAINT chk_a CHECK (a > 0) NO INHERIT;
 ERROR:  cannot add NO INHERIT constraint to partitioned table "partitioned"
-DROP TABLE partitioned, foo;
+DROP TABLE partitioned, nonpartitioned;
 --
 -- ATTACH PARTITION
 --
diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql
index a403fd8cb4d..f7b754f0bee 100644
--- a/src/test/regress/sql/alter_table.sql
+++ b/src/test/regress/sql/alter_table.sql
@@ -1923,17 +1923,17 @@ ALTER TABLE list_partitioned ALTER a DROP NOT NULL;
 DROP TABLE list_partitioned;
 
 -- partitioned table cannot participate in regular inheritance
-CREATE TABLE foo (
+CREATE TABLE nonpartitioned (
 	a int,
 	b int
 );
-ALTER TABLE partitioned INHERIT foo;
-ALTER TABLE foo INHERIT partitioned;
+ALTER TABLE partitioned INHERIT nonpartitioned;
+ALTER TABLE nonpartitioned INHERIT partitioned;
 
 -- cannot add NO INHERIT constraint to partitioned tables
 ALTER TABLE partitioned ADD CONSTRAINT chk_a CHECK (a > 0) NO INHERIT;
 
-DROP TABLE partitioned, foo;
+DROP TABLE partitioned, nonpartitioned;
 
 --
 -- ATTACH PARTITION