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

diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 95de402fa65c2803e53feb673ddf88a4aa9b6a39..58b7fc5bbd511408f06b3d81dd2a77fdfc5636ac 100644 (file)
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -4289,8 +4289,12 @@ AfterTriggerExecute(EState *estate,
    bool        should_free_new = false;
 
    /*
-    * Locate trigger in trigdesc.
+    * Locate trigger in trigdesc.  It might not be present, and in fact the
+    * trigdesc could be NULL, if the trigger was dropped since the event was
+    * queued.  In that case, silently do nothing.
     */
+   if (trigdesc == NULL)
+       return;
    for (tgindx = 0; tgindx < trigdesc->numtriggers; tgindx++)
    {
        if (trigdesc->triggers[tgindx].tgoid == tgoid)
@@ -4300,7 +4304,7 @@ AfterTriggerExecute(EState *estate,
        }
    }
    if (LocTriggerData.tg_trigger == NULL)
-       elog(ERROR, "could not find trigger %u", tgoid);
+       return;
 
    /*
     * If doing EXPLAIN ANALYZE, start charging time to this trigger. We want
@@ -4681,6 +4685,7 @@ afterTriggerInvokeEvents(AfterTriggerEventList *events,
                    /* Catch calls with insufficient relcache refcounting */
                    Assert(!RelationHasReferenceCountZero(rel));
                    trigdesc = rInfo->ri_TrigDesc;
+                   /* caution: trigdesc could be NULL here */
                    finfo = rInfo->ri_TrigFunctions;
                    instr = rInfo->ri_TrigInstrument;
                    if (slot1 != NULL)
@@ -4696,9 +4701,6 @@ afterTriggerInvokeEvents(AfterTriggerEventList *events,
                        slot2 = MakeSingleTupleTableSlot(rel->rd_att,
                                                         &TTSOpsMinimalTuple);
                    }
-                   if (trigdesc == NULL)   /* should not happen */
-                       elog(ERROR, "relation %u has no triggers",
-                            evtshared->ats_relid);
                }
 
                /*

diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out
index 7f774e5e1771ee12ca772ca53f176521af2f6772..a044d6afe2712cf4ba2c7170e514b7e9a9c8aaf4 100644 (file)
--- a/src/test/regress/expected/triggers.out
+++ b/src/test/regress/expected/triggers.out
@@ -3372,6 +3372,17 @@ select * from trig_table;
 
 drop table refd_table, trig_table;
 --
+-- Test that we can drop a not-yet-fired deferred trigger
+--
+create table refd_table (id int primary key);
+create table trig_table (fk int references refd_table initially deferred);
+begin;
+insert into trig_table values (1);
+drop table refd_table cascade;
+NOTICE:  drop cascades to constraint trig_table_fk_fkey on table trig_table
+commit;
+drop table trig_table;
+--
 -- self-referential FKs are even more fun
 --
 create table self_ref (a int primary key,

diff --git a/src/test/regress/sql/triggers.sql b/src/test/regress/sql/triggers.sql
index 6c9e066397fc36c69186e5febc970a31be23e162..51610788b212abc54fdbbd7c0f074ecb70c5300a 100644 (file)
--- a/src/test/regress/sql/triggers.sql
+++ b/src/test/regress/sql/triggers.sql
@@ -2478,6 +2478,20 @@ select * from trig_table;
 
 drop table refd_table, trig_table;
 
+--
+-- Test that we can drop a not-yet-fired deferred trigger
+--
+
+create table refd_table (id int primary key);
+create table trig_table (fk int references refd_table initially deferred);
+
+begin;
+insert into trig_table values (1);
+drop table refd_table cascade;
+commit;
+
+drop table trig_table;
+
 --
 -- self-referential FKs are even more fun
 --