diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2006-10-12 17:02:24 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2006-10-12 17:02:24 +0000 |
| commit | d2e17e1ddc3d09478575b18ce00876d8668011b3 (patch) | |
| tree | 8b0cbfef22b15cd39f874cedb5c1f05e6a24ab39 /src/backend/executor/functions.c | |
| parent | b38900c7677657a815e75781b776fb1e41054df3 (diff) | |
| download | postgresql-d2e17e1ddc3d09478575b18ce00876d8668011b3.tar.gz postgresql-d2e17e1ddc3d09478575b18ce00876d8668011b3.zip | |
Fix mishandling of after-trigger state when a SQL function returns multiple
rows --- if the surrounding query queued any trigger events between the rows,
the events would be fired at the wrong time, leading to bizarre behavior.
Per report from Merlin Moncure.
This is a simple patch that should solve the problem fully in the back
branches, but in HEAD we also need to consider the possibility of queries
with RETURNING clauses. Will look into a fix for that separately.
Diffstat (limited to 'src/backend/executor/functions.c')
| -rw-r--r-- | src/backend/executor/functions.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index f9b8067109b..278960b4970 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/functions.c,v 1.107 2006/10/04 00:29:52 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/functions.c,v 1.108 2006/10/12 17:02:24 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -327,7 +327,14 @@ postquel_start(execution_state *es, SQLFunctionCachePtr fcache) /* Utility commands don't need Executor. */ if (es->qd->operation != CMD_UTILITY) { - AfterTriggerBeginQuery(); + /* + * Only set up to collect queued triggers if it's not a SELECT. + * This isn't just an optimization, but is necessary in case a SELECT + * returns multiple rows to caller --- we mustn't exit from the + * function execution with a stacked AfterTrigger level still active. + */ + if (es->qd->operation != CMD_SELECT) + AfterTriggerBeginQuery(); ExecutorStart(es->qd, 0); } @@ -401,7 +408,8 @@ postquel_end(execution_state *es) { ActiveSnapshot = es->qd->snapshot; - AfterTriggerEndQuery(es->qd->estate); + if (es->qd->operation != CMD_SELECT) + AfterTriggerEndQuery(es->qd->estate); ExecutorEnd(es->qd); } PG_CATCH(); |