Moved the recently added test for foreign key disabled by rewrite

rule into the rule.sql since it affects the latter if run in paralell.

Jan

diff --git a/src/test/regress/expected/foreign_key.out b/src/test/regress/expected/foreign_key.out
index 89dbfcb22a8723728195b82dc1e98e8d855b942d..bfb90979f68483ae55fcd4ff5cf6507ebddc1ca0 100644 (file)
--- a/src/test/regress/expected/foreign_key.out
+++ b/src/test/regress/expected/foreign_key.out
@@ -1029,62 +1029,3 @@ INSERT INTO fktable VALUES (100, 200);
 COMMIT;
 ERROR:  insert or update on table "fktable" violates foreign key constraint "$1"
 DETAIL:  Key (fk)=(200) is not present in table "pktable".
--- Check that rewrite rules splitting one INSERT into multiple
--- conditional statements does not disable FK checking.
-create table rule_and_refint_t1 (
-   id1a integer,
-   id1b integer,
-   
-   primary key (id1a, id1b)
-);
-NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "rule_and_refint_t1_pkey" for table "rule_and_refint_t1"
-create table rule_and_refint_t2 (
-   id2a integer,
-   id2c integer,
-   
-   primary key (id2a, id2c)
-);
-NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "rule_and_refint_t2_pkey" for table "rule_and_refint_t2"
-create table rule_and_refint_t3 (
-   id3a integer,
-   id3b integer,
-   id3c integer,
-   data text,
-   primary key (id3a, id3b, id3c),
-   foreign key (id3a, id3b) references rule_and_refint_t1 (id1a, id1b),
-   foreign key (id3a, id3c) references rule_and_refint_t2 (id2a, id2c)
-);
-NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "rule_and_refint_t3_pkey" for table "rule_and_refint_t3"
-insert into rule_and_refint_t1 values (1, 11);
-insert into rule_and_refint_t1 values (1, 12);
-insert into rule_and_refint_t1 values (2, 21);
-insert into rule_and_refint_t1 values (2, 22);
-insert into rule_and_refint_t2 values (1, 11);
-insert into rule_and_refint_t2 values (1, 12);
-insert into rule_and_refint_t2 values (2, 21);
-insert into rule_and_refint_t2 values (2, 22);
-insert into rule_and_refint_t3 values (1, 11, 11, 'row1');
-insert into rule_and_refint_t3 values (1, 11, 12, 'row2');
-insert into rule_and_refint_t3 values (1, 12, 11, 'row3');
-insert into rule_and_refint_t3 values (1, 12, 12, 'row4');
-insert into rule_and_refint_t3 values (1, 11, 13, 'row5');
-ERROR:  insert or update on table "rule_and_refint_t3" violates foreign key constraint "$2"
-DETAIL:  Key (id3a,id3c)=(1,13) is not present in table "rule_and_refint_t2".
-insert into rule_and_refint_t3 values (1, 13, 11, 'row6');
-ERROR:  insert or update on table "rule_and_refint_t3" violates foreign key constraint "$1"
-DETAIL:  Key (id3a,id3b)=(1,13) is not present in table "rule_and_refint_t1".
-create rule rule_and_refint_t3_ins as on insert to rule_and_refint_t3
-   where (exists (select 1 from rule_and_refint_t3
-           where (((rule_and_refint_t3.id3a = new.id3a)
-           and (rule_and_refint_t3.id3b = new.id3b))
-           and (rule_and_refint_t3.id3c = new.id3c))))
-   do instead update rule_and_refint_t3 set data = new.data
-   where (((rule_and_refint_t3.id3a = new.id3a)
-   and (rule_and_refint_t3.id3b = new.id3b))
-   and (rule_and_refint_t3.id3c = new.id3c));
-insert into rule_and_refint_t3 values (1, 11, 13, 'row7');
-ERROR:  insert or update on table "rule_and_refint_t3" violates foreign key constraint "$2"
-DETAIL:  Key (id3a,id3c)=(1,13) is not present in table "rule_and_refint_t2".
-insert into rule_and_refint_t3 values (1, 13, 11, 'row8');
-ERROR:  insert or update on table "rule_and_refint_t3" violates foreign key constraint "$1"
-DETAIL:  Key (id3a,id3b)=(1,13) is not present in table "rule_and_refint_t1".

diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out
index fcd7b470e8de26eb52a8a81fbc72db277e984078..7ae49e8b44298ad6deb761aa9dea085caa17f2e8 100644 (file)
--- a/src/test/regress/expected/rules.out
+++ b/src/test/regress/expected/rules.out
@@ -1364,3 +1364,62 @@ SELECT * FROM ruletest_tbl2;
  1000 | 1000
 (2 rows)
 
+-- Check that rewrite rules splitting one INSERT into multiple
+-- conditional statements does not disable FK checking.
+create table rule_and_refint_t1 (
+   id1a integer,
+   id1b integer,
+   
+   primary key (id1a, id1b)
+);
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "rule_and_refint_t1_pkey" for table "rule_and_refint_t1"
+create table rule_and_refint_t2 (
+   id2a integer,
+   id2c integer,
+   
+   primary key (id2a, id2c)
+);
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "rule_and_refint_t2_pkey" for table "rule_and_refint_t2"
+create table rule_and_refint_t3 (
+   id3a integer,
+   id3b integer,
+   id3c integer,
+   data text,
+   primary key (id3a, id3b, id3c),
+   foreign key (id3a, id3b) references rule_and_refint_t1 (id1a, id1b),
+   foreign key (id3a, id3c) references rule_and_refint_t2 (id2a, id2c)
+);
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "rule_and_refint_t3_pkey" for table "rule_and_refint_t3"
+insert into rule_and_refint_t1 values (1, 11);
+insert into rule_and_refint_t1 values (1, 12);
+insert into rule_and_refint_t1 values (2, 21);
+insert into rule_and_refint_t1 values (2, 22);
+insert into rule_and_refint_t2 values (1, 11);
+insert into rule_and_refint_t2 values (1, 12);
+insert into rule_and_refint_t2 values (2, 21);
+insert into rule_and_refint_t2 values (2, 22);
+insert into rule_and_refint_t3 values (1, 11, 11, 'row1');
+insert into rule_and_refint_t3 values (1, 11, 12, 'row2');
+insert into rule_and_refint_t3 values (1, 12, 11, 'row3');
+insert into rule_and_refint_t3 values (1, 12, 12, 'row4');
+insert into rule_and_refint_t3 values (1, 11, 13, 'row5');
+ERROR:  insert or update on table "rule_and_refint_t3" violates foreign key constraint "$2"
+DETAIL:  Key (id3a,id3c)=(1,13) is not present in table "rule_and_refint_t2".
+insert into rule_and_refint_t3 values (1, 13, 11, 'row6');
+ERROR:  insert or update on table "rule_and_refint_t3" violates foreign key constraint "$1"
+DETAIL:  Key (id3a,id3b)=(1,13) is not present in table "rule_and_refint_t1".
+create rule rule_and_refint_t3_ins as on insert to rule_and_refint_t3
+   where (exists (select 1 from rule_and_refint_t3
+           where (((rule_and_refint_t3.id3a = new.id3a)
+           and (rule_and_refint_t3.id3b = new.id3b))
+           and (rule_and_refint_t3.id3c = new.id3c))))
+   do instead update rule_and_refint_t3 set data = new.data
+   where (((rule_and_refint_t3.id3a = new.id3a)
+   and (rule_and_refint_t3.id3b = new.id3b))
+   and (rule_and_refint_t3.id3c = new.id3c));
+insert into rule_and_refint_t3 values (1, 11, 13, 'row7');
+ERROR:  insert or update on table "rule_and_refint_t3" violates foreign key constraint "$2"
+DETAIL:  Key (id3a,id3c)=(1,13) is not present in table "rule_and_refint_t2".
+insert into rule_and_refint_t3 values (1, 13, 11, 'row8');
+ERROR:  insert or update on table "rule_and_refint_t3" violates foreign key constraint "$1"
+DETAIL:  Key (id3a,id3b)=(1,13) is not present in table "rule_and_refint_t1".

diff --git a/src/test/regress/sql/foreign_key.sql b/src/test/regress/sql/foreign_key.sql
index 0d54b77f3036aca41b1f2e7e1a16b07ac1fc9acd..009588db065ac46ea0f101fc0a104858faf166f2 100644 (file)
--- a/src/test/regress/sql/foreign_key.sql
+++ b/src/test/regress/sql/foreign_key.sql
@@ -693,62 +693,3 @@ INSERT INTO fktable VALUES (100, 200);
 
 -- error here on commit
 COMMIT;
-
--- Check that rewrite rules splitting one INSERT into multiple
--- conditional statements does not disable FK checking.
-create table rule_and_refint_t1 (
-   id1a integer,
-   id1b integer,
-   
-   primary key (id1a, id1b)
-);
-
-create table rule_and_refint_t2 (
-   id2a integer,
-   id2c integer,
-   
-   primary key (id2a, id2c)
-);
-
-create table rule_and_refint_t3 (
-   id3a integer,
-   id3b integer,
-   id3c integer,
-   data text,
-
-   primary key (id3a, id3b, id3c),
-
-   foreign key (id3a, id3b) references rule_and_refint_t1 (id1a, id1b),
-   foreign key (id3a, id3c) references rule_and_refint_t2 (id2a, id2c)
-);
-
-
-insert into rule_and_refint_t1 values (1, 11);
-insert into rule_and_refint_t1 values (1, 12);
-insert into rule_and_refint_t1 values (2, 21);
-insert into rule_and_refint_t1 values (2, 22);
-
-insert into rule_and_refint_t2 values (1, 11);
-insert into rule_and_refint_t2 values (1, 12);
-insert into rule_and_refint_t2 values (2, 21);
-insert into rule_and_refint_t2 values (2, 22);
-
-insert into rule_and_refint_t3 values (1, 11, 11, 'row1');
-insert into rule_and_refint_t3 values (1, 11, 12, 'row2');
-insert into rule_and_refint_t3 values (1, 12, 11, 'row3');
-insert into rule_and_refint_t3 values (1, 12, 12, 'row4');
-insert into rule_and_refint_t3 values (1, 11, 13, 'row5');
-insert into rule_and_refint_t3 values (1, 13, 11, 'row6');
-
-create rule rule_and_refint_t3_ins as on insert to rule_and_refint_t3
-   where (exists (select 1 from rule_and_refint_t3
-           where (((rule_and_refint_t3.id3a = new.id3a)
-           and (rule_and_refint_t3.id3b = new.id3b))
-           and (rule_and_refint_t3.id3c = new.id3c))))
-   do instead update rule_and_refint_t3 set data = new.data
-   where (((rule_and_refint_t3.id3a = new.id3a)
-   and (rule_and_refint_t3.id3b = new.id3b))
-   and (rule_and_refint_t3.id3c = new.id3c));
-
-insert into rule_and_refint_t3 values (1, 11, 13, 'row7');
-insert into rule_and_refint_t3 values (1, 13, 11, 'row8');

diff --git a/src/test/regress/sql/rules.sql b/src/test/regress/sql/rules.sql
index a2c01c6e9318cd428b8b173924a73673937246ec..d797144d9d109b7cd07f9faa41bb1137f367e7af 100644 (file)
--- a/src/test/regress/sql/rules.sql
+++ b/src/test/regress/sql/rules.sql
@@ -786,3 +786,62 @@ CREATE OR REPLACE RULE myrule AS ON INSERT TO ruletest_tbl
 INSERT INTO ruletest_tbl VALUES (99, 99);
 
 SELECT * FROM ruletest_tbl2;
+
+-- Check that rewrite rules splitting one INSERT into multiple
+-- conditional statements does not disable FK checking.
+create table rule_and_refint_t1 (
+   id1a integer,
+   id1b integer,
+   
+   primary key (id1a, id1b)
+);
+
+create table rule_and_refint_t2 (
+   id2a integer,
+   id2c integer,
+   
+   primary key (id2a, id2c)
+);
+
+create table rule_and_refint_t3 (
+   id3a integer,
+   id3b integer,
+   id3c integer,
+   data text,
+
+   primary key (id3a, id3b, id3c),
+
+   foreign key (id3a, id3b) references rule_and_refint_t1 (id1a, id1b),
+   foreign key (id3a, id3c) references rule_and_refint_t2 (id2a, id2c)
+);
+
+
+insert into rule_and_refint_t1 values (1, 11);
+insert into rule_and_refint_t1 values (1, 12);
+insert into rule_and_refint_t1 values (2, 21);
+insert into rule_and_refint_t1 values (2, 22);
+
+insert into rule_and_refint_t2 values (1, 11);
+insert into rule_and_refint_t2 values (1, 12);
+insert into rule_and_refint_t2 values (2, 21);
+insert into rule_and_refint_t2 values (2, 22);
+
+insert into rule_and_refint_t3 values (1, 11, 11, 'row1');
+insert into rule_and_refint_t3 values (1, 11, 12, 'row2');
+insert into rule_and_refint_t3 values (1, 12, 11, 'row3');
+insert into rule_and_refint_t3 values (1, 12, 12, 'row4');
+insert into rule_and_refint_t3 values (1, 11, 13, 'row5');
+insert into rule_and_refint_t3 values (1, 13, 11, 'row6');
+
+create rule rule_and_refint_t3_ins as on insert to rule_and_refint_t3
+   where (exists (select 1 from rule_and_refint_t3
+           where (((rule_and_refint_t3.id3a = new.id3a)
+           and (rule_and_refint_t3.id3b = new.id3b))
+           and (rule_and_refint_t3.id3c = new.id3c))))
+   do instead update rule_and_refint_t3 set data = new.data
+   where (((rule_and_refint_t3.id3a = new.id3a)
+   and (rule_and_refint_t3.id3b = new.id3b))
+   and (rule_and_refint_t3.id3c = new.id3c));
+
+insert into rule_and_refint_t3 values (1, 11, 13, 'row7');
+insert into rule_and_refint_t3 values (1, 13, 11, 'row8');