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

git projects / postgresql.git / commitdiff

Fix oversight in FindTriggerIncompatibleWithInheritance.

author Etsuro Fujita <efujita@postgresql.org>

Fri, 8 Aug 2025 08:35:02 +0000 (17:35 +0900)

committer Etsuro Fujita <efujita@postgresql.org>

Fri, 8 Aug 2025 08:35:02 +0000 (17:35 +0900)

This function is called from ATExecAttachPartition/ATExecAddInherit,
which prevent tables with row-level triggers with transition tables from
becoming partitions or inheritance children, to check if there is such a
trigger on the given table, but failed to check if a found trigger is
row-level, causing the caller functions to needlessly prevent a table
with only a statement-level trigger with transition tables from becoming
a partition or inheritance child. Repair.

Oversight in commit 501ed02cf.

Author: Etsuro Fujita <etsuro.fujita@gmail.com>
Discussion: https://postgr.es/m/CAPmGK167mXzwzzmJ_0YZ3EZrbwiCxtM1vogH_8drqsE6PtxRYw%40mail.gmail.com
Backpatch-through: 13

src/backend/commands/trigger.c patch | blob | blame | history

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

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

diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c

index 6a266aeed0e0acc5885020b0babe46d485b9643e..8bb2b35a8b8012fea6fee91e5b178aad51fb31cb 100644 (file)

--- a/src/backend/commands/trigger.c

+++ b/src/backend/commands/trigger.c

@@ -2348,6 +2348,8 @@ FindTriggerIncompatibleWithInheritance(TriggerDesc *trigdesc)

{

Trigger *trigger = &trigdesc->triggers[i];

+ if (!TRIGGER_FOR_ROW(trigger->tgtype))

+ continue;

if (trigger->tgoldtable != NULL || trigger->tgnewtable != NULL)

return trigger->tgname;

}

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

index 7125fee3f850d131276cbfe9edc24bb9391518d5..7856d57aff885d5ae1f1c0b247059094edf3639b 100644 (file)

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

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

@@ -3016,6 +3016,10 @@ NOTICE: trigger = child3_delete_trig, old table = (42,CCC)

-- copy into parent sees parent-format tuples

copy parent (a, b) from stdin;

NOTICE: trigger = parent_insert_trig, new table = (AAA,42), (BBB,42), (CCC,42)

+-- check detach/reattach behavior; statement triggers with transition tables

+-- should not prevent a table from becoming a partition again

+alter table parent detach partition child1;

+alter table parent attach partition child1 for values in ('AAA');

-- DML affecting parent sees tuples collected from children even if

-- there is no transition table trigger on the children

drop trigger child1_insert_trig on child1;

@@ -3213,6 +3217,10 @@ NOTICE: trigger = parent_insert_trig, new table = (AAA,42), (BBB,42), (CCC,42)

create index on parent(b);

copy parent (a, b) from stdin;

NOTICE: trigger = parent_insert_trig, new table = (DDD,42)

+-- check disinherit/reinherit behavior; statement triggers with transition

+-- tables should not prevent a table from becoming an inheritance child again

+alter table child1 no inherit parent;

+alter table child1 inherit parent;

-- DML affecting parent sees tuples collected from children even if

-- there is no transition table trigger on the children

drop trigger child1_insert_trig on child1;

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

index a3c3115a6e721984dc8b148815fb29dadeaa709d..5a0fa012f1fbc7e625418aeed211f29e7729a28a 100644 (file)

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

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

@@ -2110,6 +2110,11 @@ BBB 42

CCC 42

+-- check detach/reattach behavior; statement triggers with transition tables

+-- should not prevent a table from becoming a partition again

+alter table parent detach partition child1;

+alter table parent attach partition child1 for values in ('AAA');

-- DML affecting parent sees tuples collected from children even if

-- there is no transition table trigger on the children

drop trigger child1_insert_trig on child1;

@@ -2329,6 +2334,11 @@ copy parent (a, b) from stdin;

DDD 42

+-- check disinherit/reinherit behavior; statement triggers with transition

+-- tables should not prevent a table from becoming an inheritance child again

+alter table child1 no inherit parent;

+alter table child1 inherit parent;

-- DML affecting parent sees tuples collected from children even if

-- there is no transition table trigger on the children

drop trigger child1_insert_trig on child1;

This is the main PostgreSQL git repository.

RSS Atom