git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

author Alvaro Herrera <alvherre@alvh.no-ip.org>

2018年2月13日 22:47:16 +0000 (19:47 -0300)

committer Alvaro Herrera <alvherre@alvh.no-ip.org>

2018年2月17日 16:18:34 +0000 (13:18 -0300)

This makes it more explicit exactly what is going on, for further
proposed behavior changes.

Discussion: https://postgr.es/m/20180214212624.hm7of76flesodamf@alvherre.pgsql

src/test/regress/expected/triggers.out patch | blob | blame | history

src/test/regress/sql/triggers.sql patch | blob | blame | history

diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out

index 98db323337b5289e84b3bd2bf7f8cfa719295cac..e7b4b31afc2012046275ec960d96607ce8f8ab12 100644 (file)

--- a/src/test/regress/expected/triggers.out

+++ b/src/test/regress/expected/triggers.out

@@ -1865,7 +1865,7 @@ create table parted2_stmt_trig1 partition of parted2_stmt_trig for values in (1)

create table parted2_stmt_trig2 partition of parted2_stmt_trig for values in (2);

create or replace function trigger_notice() returns trigger as $$

begin

- raise notice 'trigger on % % % for %', TG_TABLE_NAME, TG_WHEN, TG_OP, TG_LEVEL;

+ raise notice 'trigger % on % % % for %', TG_NAME, TG_TABLE_NAME, TG_WHEN, TG_OP, TG_LEVEL;

if TG_LEVEL = 'ROW' then

return NEW;

end if;

@@ -1910,12 +1910,12 @@ create trigger trig_del_after after delete on parted2_stmt_trig

with ins (a) as (

insert into parted2_stmt_trig values (1), (2) returning a

) insert into parted_stmt_trig select a from ins returning tableoid::regclass, a;

-NOTICE: trigger on parted_stmt_trig BEFORE INSERT for STATEMENT

-NOTICE: trigger on parted2_stmt_trig BEFORE INSERT for STATEMENT

-NOTICE: trigger on parted_stmt_trig1 BEFORE INSERT for ROW

-NOTICE: trigger on parted_stmt_trig1 AFTER INSERT for ROW

-NOTICE: trigger on parted2_stmt_trig AFTER INSERT for STATEMENT

-NOTICE: trigger on parted_stmt_trig AFTER INSERT for STATEMENT

+NOTICE: trigger trig_ins_before on parted_stmt_trig BEFORE INSERT for STATEMENT

+NOTICE: trigger trig_ins_before on parted2_stmt_trig BEFORE INSERT for STATEMENT

+NOTICE: trigger trig_ins_before on parted_stmt_trig1 BEFORE INSERT for ROW

+NOTICE: trigger trig_ins_after on parted_stmt_trig1 AFTER INSERT for ROW

+NOTICE: trigger trig_ins_after on parted2_stmt_trig AFTER INSERT for STATEMENT

+NOTICE: trigger trig_ins_after on parted_stmt_trig AFTER INSERT for STATEMENT

tableoid | a

-------------------+---

parted_stmt_trig1 | 1

@@ -1925,25 +1925,25 @@ NOTICE: trigger on parted_stmt_trig AFTER INSERT for STATEMENT

with upd as (

update parted2_stmt_trig set a = a

) update parted_stmt_trig set a = a;

-NOTICE: trigger on parted_stmt_trig BEFORE UPDATE for STATEMENT

-NOTICE: trigger on parted_stmt_trig1 BEFORE UPDATE for ROW

-NOTICE: trigger on parted2_stmt_trig BEFORE UPDATE for STATEMENT

-NOTICE: trigger on parted_stmt_trig1 AFTER UPDATE for ROW

-NOTICE: trigger on parted_stmt_trig AFTER UPDATE for STATEMENT

-NOTICE: trigger on parted2_stmt_trig AFTER UPDATE for STATEMENT

+NOTICE: trigger trig_upd_before on parted_stmt_trig BEFORE UPDATE for STATEMENT

+NOTICE: trigger trig_upd_before on parted_stmt_trig1 BEFORE UPDATE for ROW

+NOTICE: trigger trig_upd_before on parted2_stmt_trig BEFORE UPDATE for STATEMENT

+NOTICE: trigger trig_upd_after on parted_stmt_trig1 AFTER UPDATE for ROW

+NOTICE: trigger trig_upd_after on parted_stmt_trig AFTER UPDATE for STATEMENT

+NOTICE: trigger trig_upd_after on parted2_stmt_trig AFTER UPDATE for STATEMENT

delete from parted_stmt_trig;

-NOTICE: trigger on parted_stmt_trig BEFORE DELETE for STATEMENT

-NOTICE: trigger on parted_stmt_trig AFTER DELETE for STATEMENT

+NOTICE: trigger trig_del_before on parted_stmt_trig BEFORE DELETE for STATEMENT

+NOTICE: trigger trig_del_after on parted_stmt_trig AFTER DELETE for STATEMENT

-- insert via copy on the parent

copy parted_stmt_trig(a) from stdin;

-NOTICE: trigger on parted_stmt_trig BEFORE INSERT for STATEMENT

-NOTICE: trigger on parted_stmt_trig1 BEFORE INSERT for ROW

-NOTICE: trigger on parted_stmt_trig1 AFTER INSERT for ROW

-NOTICE: trigger on parted_stmt_trig AFTER INSERT for STATEMENT

+NOTICE: trigger trig_ins_before on parted_stmt_trig BEFORE INSERT for STATEMENT

+NOTICE: trigger trig_ins_before on parted_stmt_trig1 BEFORE INSERT for ROW

+NOTICE: trigger trig_ins_after on parted_stmt_trig1 AFTER INSERT for ROW

+NOTICE: trigger trig_ins_after on parted_stmt_trig AFTER INSERT for STATEMENT

-- insert via copy on the first partition

copy parted_stmt_trig1(a) from stdin;

-NOTICE: trigger on parted_stmt_trig1 BEFORE INSERT for ROW

-NOTICE: trigger on parted_stmt_trig1 AFTER INSERT for ROW

+NOTICE: trigger trig_ins_before on parted_stmt_trig1 BEFORE INSERT for ROW

+NOTICE: trigger trig_ins_after on parted_stmt_trig1 AFTER INSERT for ROW

drop table parted_stmt_trig, parted2_stmt_trig;

-- Test the interaction between transition tables and both kinds of

diff --git a/src/test/regress/sql/triggers.sql b/src/test/regress/sql/triggers.sql

index dba9bdd98b682465305b893280424d2b70daf6e7..ae8349ccbfadb0b762e595606e7903dbe509936b 100644 (file)

--- a/src/test/regress/sql/triggers.sql

+++ b/src/test/regress/sql/triggers.sql

@@ -1317,7 +1317,7 @@ create table parted2_stmt_trig2 partition of parted2_stmt_trig for values in (2)

create or replace function trigger_notice() returns trigger as $$

begin

- raise notice 'trigger on % % % for %', TG_TABLE_NAME, TG_WHEN, TG_OP, TG_LEVEL;

+ raise notice 'trigger % on % % % for %', TG_NAME, TG_TABLE_NAME, TG_WHEN, TG_OP, TG_LEVEL;

if TG_LEVEL = 'ROW' then

return NEW;

end if;

This is the main PostgreSQL git repository.

RSS Atom