diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-04-27 22:05:49 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-04-27 22:05:49 +0000 |
| commit | bbbe825f5f46d7ead60502f43d3b414719a41aa5 (patch) | |
| tree | b4dda033d2ecee0e6ba083621763e058ae0b7ba4 /src/backend/executor/execMain.c | |
| parent | a264671116ab9ba45fb20441c16fe0783e52857b (diff) | |
| download | postgresql-bbbe825f5f46d7ead60502f43d3b414719a41aa5.tar.gz postgresql-bbbe825f5f46d7ead60502f43d3b414719a41aa5.zip | |
Modify processing of DECLARE CURSOR and EXPLAIN so that they can resolve the
types of unspecified parameters when submitted via extended query protocol.
This worked in 8.2 but I had broken it during plancache changes. DECLARE
CURSOR is now treated almost exactly like a plain SELECT through parse
analysis, rewrite, and planning; only just before sending to the executor
do we divert it away to ProcessUtility. This requires a special-case check
in a number of places, but practically all of them were already special-casing
SELECT INTO, so it's not too ugly. (Maybe it would be a good idea to merge
the two by treating IntoClause as a form of utility statement? Not going to
worry about that now, though.) That approach doesn't work for EXPLAIN,
however, so for that I punted and used a klugy solution of running parse
analysis an extra time if under extended query protocol.
Diffstat (limited to 'src/backend/executor/execMain.c')
| -rw-r--r-- | src/backend/executor/execMain.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index cacd7c6fe70..298d0c69c9d 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.292 2007/03/29 00:15:38 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.293 2007/04/27 22:05:47 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -420,7 +420,7 @@ ExecCheckXactReadOnly(PlannedStmt *plannedstmt) * * XXX should we allow this if the destination is temp? */ - if (plannedstmt->into != NULL) + if (plannedstmt->intoClause != NULL) goto fail; /* Fail if write permissions are requested on any non-temp table */ @@ -522,10 +522,10 @@ InitPlan(QueryDesc *queryDesc, int eflags) * correct tuple descriptors. (Other SELECT INTO stuff comes later.) */ estate->es_select_into = false; - if (operation == CMD_SELECT && plannedstmt->into != NULL) + if (operation == CMD_SELECT && plannedstmt->intoClause != NULL) { estate->es_select_into = true; - estate->es_into_oids = interpretOidsOption(plannedstmt->into->options); + estate->es_into_oids = interpretOidsOption(plannedstmt->intoClause->options); } /* @@ -2395,7 +2395,7 @@ typedef struct static void OpenIntoRel(QueryDesc *queryDesc) { - IntoClause *into = queryDesc->plannedstmt->into; + IntoClause *into = queryDesc->plannedstmt->intoClause; EState *estate = queryDesc->estate; Relation intoRelationDesc; char *intoName; |