This patch fixes in intermittent failure in the regression tests:

there was a race condition between the "alter_table" and "rules"
regression tests. Depending on scheduling, sometimes an ALTER
TABLE command would operate on a relation created by the "rules"
tests, leading to unexpected results.

Neil Conway

diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index 741b012c2896d196d198100f21f14a5f37150dd7..3833600f2b5e2319a1f40fcd92884c2b926d4e8b 100644 (file)
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -615,10 +615,10 @@ ERROR:  ALTER TABLE: relation "pg_class" is a system catalog
 alter table pg_class alter relname set not null;
 ERROR:  ALTER TABLE: relation "pg_class" is a system catalog
 -- try altering non-existent table, should fail
-alter table foo alter column bar set not null;
-ERROR:  Relation "foo" does not exist
-alter table foo alter column bar drop not null;
-ERROR:  Relation "foo" does not exist
+alter table non_existent alter column bar set not null;
+ERROR:  Relation "non_existent" does not exist
+alter table non_existent alter column bar drop not null;
+ERROR:  Relation "non_existent" does not exist
 -- test setting columns to null and not null and vice versa
 -- test checking for null values and primary key
 create table atacc1 (test int not null);

diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql
index 8946d2b15b35332becdf06f260076081877daadd..6eaae24fa80ce2932945d39d1b969c544c5f9860 100644 (file)
--- a/src/test/regress/sql/alter_table.sql
+++ b/src/test/regress/sql/alter_table.sql
@@ -478,8 +478,8 @@ alter table pg_class alter column relname drop not null;
 alter table pg_class alter relname set not null;
 
 -- try altering non-existent table, should fail
-alter table foo alter column bar set not null;
-alter table foo alter column bar drop not null;
+alter table non_existent alter column bar set not null;
+alter table non_existent alter column bar drop not null;
 
 -- test setting columns to null and not null and vice versa
 -- test checking for null values and primary key