aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2017-02-21 12:18:22 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2017-02-21 12:18:30 -0500
commit1c95f0b478a91b58391720dcda35bc032e582564 (patch)
tree6a8f98ee38dbea10b90f7380a46e558d6f5a6b8f
parent38d103763d14baddf3cbfe4b00b501059fc9447f (diff)
downloadpostgresql-1c95f0b478a91b58391720dcda35bc032e582564.tar.gz
postgresql-1c95f0b478a91b58391720dcda35bc032e582564.zip
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.
-rw-r--r--src/test/regress/expected/alter_table.out8
-rw-r--r--src/test/regress/sql/alter_table.sql8
2 files changed, 8 insertions, 8 deletions
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