From 4b9f6cd9e019e61118e38caad452caf2ec23af35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dagfinn=20Ilmari=20Manns=C3=A5ker?= Date: Wed, 19 Jun 2019 17:59:19 +0100 Subject: [PATCH] Remove master/slave usage from plpgsql tests --- src/pl/plpgsql/src/expected/plpgsql_trap.out | 24 ++++++++++---------- src/pl/plpgsql/src/sql/plpgsql_trap.sql | 12 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/pl/plpgsql/src/expected/plpgsql_trap.out b/src/pl/plpgsql/src/expected/plpgsql_trap.out index 881603f5c4..bb8f065bc0 100644 --- a/src/pl/plpgsql/src/expected/plpgsql_trap.out +++ b/src/pl/plpgsql/src/expected/plpgsql_trap.out @@ -186,17 +186,17 @@ NOTICE: should see this only if -100 fits in smallint -- -- test foreign key error trapping -- -create temp table master(f1 int primary key); -create temp table slave(f1 int references master deferrable); -insert into master values(1); -insert into slave values(1); -insert into slave values(2); -- fails -ERROR: insert or update on table "slave" violates foreign key constraint "slave_f1_fkey" -DETAIL: Key (f1)=(2) is not present in table "master". +create temp table base(f1 int primary key); +create temp table leaf(f1 int references base deferrable); +insert into base values(1); +insert into leaf values(1); +insert into leaf values(2); -- fails +ERROR: insert or update on table "leaf" violates foreign key constraint "leaf_f1_fkey" +DETAIL: Key (f1)=(2) is not present in table "base". create function trap_foreign_key(int) returns int as $$ begin begin -- start a subtransaction - insert into slave values($1); + insert into leaf values($1); exception when foreign_key_violation then raise notice 'caught foreign_key_violation'; @@ -238,8 +238,8 @@ begin; savepoint x; set constraints all immediate; -- fails -ERROR: insert or update on table "slave" violates foreign key constraint "slave_f1_fkey" -DETAIL: Key (f1)=(2) is not present in table "master". +ERROR: insert or update on table "leaf" violates foreign key constraint "leaf_f1_fkey" +DETAIL: Key (f1)=(2) is not present in table "base". rollback to x; select trap_foreign_key_2(); -- detects FK violation NOTICE: caught foreign_key_violation @@ -249,7 +249,7 @@ NOTICE: caught foreign_key_violation (1 row) commit; -- still fails -ERROR: insert or update on table "slave" violates foreign key constraint "slave_f1_fkey" -DETAIL: Key (f1)=(2) is not present in table "master". +ERROR: insert or update on table "leaf" violates foreign key constraint "leaf_f1_fkey" +DETAIL: Key (f1)=(2) is not present in table "base". drop function trap_foreign_key(int); drop function trap_foreign_key_2(); diff --git a/src/pl/plpgsql/src/sql/plpgsql_trap.sql b/src/pl/plpgsql/src/sql/plpgsql_trap.sql index 7e75f46934..b658cb1888 100644 --- a/src/pl/plpgsql/src/sql/plpgsql_trap.sql +++ b/src/pl/plpgsql/src/sql/plpgsql_trap.sql @@ -127,18 +127,18 @@ select test_variable_storage(); -- test foreign key error trapping -- -create temp table master(f1 int primary key); +create temp table base(f1 int primary key); -create temp table slave(f1 int references master deferrable); +create temp table leaf(f1 int references base deferrable); -insert into master values(1); -insert into slave values(1); -insert into slave values(2); -- fails +insert into base values(1); +insert into leaf values(1); +insert into leaf values(2); -- fails create function trap_foreign_key(int) returns int as $$ begin begin -- start a subtransaction - insert into slave values($1); + insert into leaf values($1); exception when foreign_key_violation then raise notice 'caught foreign_key_violation'; -- 2.20.1