diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-10-27 20:14:33 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-10-27 20:14:33 +0000 |
| commit | f18a77acc842ef466128d9ee6b5e26d63d19d1bf (patch) | |
| tree | 3ec88fdc5f3cc4b0808ab3f77e00fd7861756b62 | |
| parent | bd02b48ba44c6e0593320a9c3e071ba78efe1c04 (diff) | |
| download | postgresql-f18a77acc842ef466128d9ee6b5e26d63d19d1bf.tar.gz postgresql-f18a77acc842ef466128d9ee6b5e26d63d19d1bf.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 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index bb628ed80a3..2505de06230 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.248 2009/06/18 01:27:02 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.248.2.1 2009/10/27 20:14:33 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -3800,9 +3800,15 @@ AfterTriggerSaveEvent(ResultRelInfo *relinfo, int event, bool row_trigger, int ntriggers; int *tgindx; + /* + * 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"); - Assert(afterTriggers->query_depth >= 0); + if (afterTriggers->query_depth < 0) + elog(ERROR, "AfterTriggerSaveEvent() called outside of query"); /* * Validate the event code and collect the associated tuple CTIDs. |