diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2006-08-14 22:57:15 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2006-08-14 22:57:15 +0000 |
| commit | 65b2f93b587be67ea1d5e4d98a99599937aa7b19 (patch) | |
| tree | fdb266a0f1070e45df5385b6721d6b0a9998675f /src/backend/commands/prepare.c | |
| parent | 3d1e01caa46b87b734e4758ad9885e1e12bc77c8 (diff) | |
| download | postgresql-65b2f93b587be67ea1d5e4d98a99599937aa7b19.tar.gz postgresql-65b2f93b587be67ea1d5e4d98a99599937aa7b19.zip | |
Fix oversight in initial implementation of PORTAL_ONE_RETURNING mode: we
cannot assume that there's exactly one Query in the Portal, as we can for
ONE_SELECT mode, because non-SELECT queries might have extra queries added
during rule rewrites. Fix things up so that we'll use ONE_RETURNING mode
when a Portal contains one primary (canSetTag) query and that query has
a RETURNING list. This appears to be a second showstopper reason for running
the Portal to completion before we start to hand anything back --- we want
to be sure that the rule-added queries get run too.
Diffstat (limited to 'src/backend/commands/prepare.c')
| -rw-r--r-- | src/backend/commands/prepare.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c index b96426856cd..82ad85a410a 100644 --- a/src/backend/commands/prepare.c +++ b/src/backend/commands/prepare.c @@ -10,7 +10,7 @@ * Copyright (c) 2002-2006, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.60 2006/08/12 02:52:04 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.61 2006/08/14 22:57:15 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -448,7 +448,7 @@ FetchPreparedStatementResultDesc(PreparedStatement *stmt) return ExecCleanTypeFromTL(query->targetList, false); case PORTAL_ONE_RETURNING: - query = (Query *) linitial(stmt->query_list); + query = PortalListGetPrimaryQuery(stmt->query_list); return ExecCleanTypeFromTL(query->returningList, false); case PORTAL_UTIL_SELECT: @@ -505,7 +505,7 @@ FetchPreparedStatementTargetList(PreparedStatement *stmt) if (strategy == PORTAL_ONE_SELECT) return ((Query *) linitial(stmt->query_list))->targetList; if (strategy == PORTAL_ONE_RETURNING) - return ((Query *) linitial(stmt->query_list))->returningList; + return (PortalListGetPrimaryQuery(stmt->query_list))->returningList; if (strategy == PORTAL_UTIL_SELECT) { Node *utilityStmt; |