Skip to content

Commit 88f3baa

Browse files
committed
Don't throw an error if a queued AFTER trigger no longer exists.
afterTriggerInvokeEvents and AfterTriggerExecute have always treated it as an error if the trigger OID mentioned in a queued after-trigger event can't be found. However, that fails to account for the edge case where the trigger's been dropped in the current transaction since queueing the event. There seems no very good reason to disallow that case, so instead silently do nothing if the trigger OID can't be found. This does give up a little bit of bug-detection ability, but I don't recall that these error messages have ever actually revealed a bug, so it seems mostly theoretical. Alternatives such as marking pending events DONE at the time of dropping a trigger would be complicated and perhaps introduce bugs of their own. Per bug #18517 from Alexander Lakhin. Back-patch to all supported branches. Discussion: https://postgr.es/m/18517-af2d19882240902c@postgresql.org
1 parent dae9f16 commit 88f3baa

File tree

3 files changed

+32
-5
lines changed

3 files changed

+32
-5
lines changed

src/backend/commands/trigger.c

+7-5
Original file line numberDiff line numberDiff line change
@@ -3997,8 +3997,12 @@ AfterTriggerExecute(EState *estate,
39973997
bool should_free_new = false;
39983998

39993999
/*
4000-
* Locate trigger in trigdesc.
4000+
* Locate trigger in trigdesc. It might not be present, and in fact the
4001+
* trigdesc could be NULL, if the trigger was dropped since the event was
4002+
* queued. In that case, silently do nothing.
40014003
*/
4004+
if (trigdesc == NULL)
4005+
return;
40024006
for (tgindx = 0; tgindx < trigdesc->numtriggers; tgindx++)
40034007
{
40044008
if (trigdesc->triggers[tgindx].tgoid == tgoid)
@@ -4008,7 +4012,7 @@ AfterTriggerExecute(EState *estate,
40084012
}
40094013
}
40104014
if (LocTriggerData.tg_trigger == NULL)
4011-
elog(ERROR, "could not find trigger %u", tgoid);
4015+
return;
40124016

40134017
/*
40144018
* If doing EXPLAIN ANALYZE, start charging time to this trigger. We want
@@ -4332,6 +4336,7 @@ afterTriggerInvokeEvents(AfterTriggerEventList *events,
43324336
/* Catch calls with insufficient relcache refcounting */
43334337
Assert(!RelationHasReferenceCountZero(rel));
43344338
trigdesc = rInfo->ri_TrigDesc;
4339+
/* caution: trigdesc could be NULL here */
43354340
finfo = rInfo->ri_TrigFunctions;
43364341
instr = rInfo->ri_TrigInstrument;
43374342
if (slot1 != NULL)
@@ -4347,9 +4352,6 @@ afterTriggerInvokeEvents(AfterTriggerEventList *events,
43474352
slot2 = MakeSingleTupleTableSlot(rel->rd_att,
43484353
&TTSOpsMinimalTuple);
43494354
}
4350-
if (trigdesc == NULL) /* should not happen */
4351-
elog(ERROR, "relation %u has no triggers",
4352-
evtshared->ats_relid);
43534355
}
43544356

43554357
/*

src/test/regress/expected/triggers.out

+11
Original file line numberDiff line numberDiff line change
@@ -3286,6 +3286,17 @@ select * from trig_table;
32863286

32873287
drop table refd_table, trig_table;
32883288
--
3289+
-- Test that we can drop a not-yet-fired deferred trigger
3290+
--
3291+
create table refd_table (id int primary key);
3292+
create table trig_table (fk int references refd_table initially deferred);
3293+
begin;
3294+
insert into trig_table values (1);
3295+
drop table refd_table cascade;
3296+
NOTICE: drop cascades to constraint trig_table_fk_fkey on table trig_table
3297+
commit;
3298+
drop table trig_table;
3299+
--
32893300
-- self-referential FKs are even more fun
32903301
--
32913302
create table self_ref (a int primary key,

src/test/regress/sql/triggers.sql

+14
Original file line numberDiff line numberDiff line change
@@ -2406,6 +2406,20 @@ select * from trig_table;
24062406

24072407
drop table refd_table, trig_table;
24082408

2409+
--
2410+
-- Test that we can drop a not-yet-fired deferred trigger
2411+
--
2412+
2413+
create table refd_table (id int primary key);
2414+
create table trig_table (fk int references refd_table initially deferred);
2415+
2416+
begin;
2417+
insert into trig_table values (1);
2418+
drop table refd_table cascade;
2419+
commit;
2420+
2421+
drop table trig_table;
2422+
24092423
--
24102424
-- self-referential FKs are even more fun
24112425
--

0 commit comments

Comments
 (0)