diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-10-27 20:14:56 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-10-27 20:14:56 +0000 |
| commit | 08dd656b71202911be7bcf4f554558a18138c867 (patch) | |
| tree | 5b9b189e0b5f7bbb65e20ff93e470343534db83b | |
| parent | 53c8f77da0016f867efeb58fbd6fe23eee729b93 (diff) | |
| download | postgresql-08dd656b71202911be7bcf4f554558a18138c867.tar.gz postgresql-08dd656b71202911be7bcf4f554558a18138c867.zip | |
Fix AfterTriggerSaveEvent to use a test and elog, not just Assert, to check
that it's called within an AfterTriggerBeginQuery/AfterTriggerEndQuery pair.
The RI cascade triggers suppress that overhead on the assumption that they
are always run non-deferred, so it's possible to violate the condition if
someone mistakenly changes pg_trigger to mark such a trigger deferred.
We don't really care about supporting that, but throwing an error instead
of crashing seems desirable. Per report from Marcelo Costa.
| -rw-r--r-- | src/backend/commands/trigger.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 1660ef0f04e..5c97e5feabe 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.195.2.6 2008/10/25 03:32:58 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.195.2.7 2009/10/27 20:14:56 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -3157,8 +3157,15 @@ AfterTriggerSaveEvent(ResultRelInfo *relinfo, int event, bool row_trigger, ItemPointerData oldctid; ItemPointerData newctid; + /* + * Check state. We use normal tests not Asserts because it is possible + * to reach here in the wrong state given misconfigured RI triggers, + * in particular deferring a cascade action trigger. + */ if (afterTriggers == NULL) elog(ERROR, "AfterTriggerSaveEvent() called outside of transaction"); + if (afterTriggers->query_depth < 0) + elog(ERROR, "AfterTriggerSaveEvent() called outside of query"); /* * Get the CTID's of OLD and NEW |