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/spi.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/spi.c')
| -rw-r--r-- | src/backend/executor/spi.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c index 0a5625a0c58..f97a86fe214 100644 --- a/src/backend/executor/spi.c +++ b/src/backend/executor/spi.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.178 2007/04/16 18:21:07 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.179 2007/04/27 22:05:47 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1581,7 +1581,8 @@ _SPI_execute_plan(SPIPlanPtr plan, Datum *Values, const char *Nulls, ActiveSnapshot->curcid = GetCurrentCommandId(); } - if (IsA(stmt, PlannedStmt)) + if (IsA(stmt, PlannedStmt) && + ((PlannedStmt *) stmt)->utilityStmt == NULL) { qdesc = CreateQueryDesc((PlannedStmt *) stmt, ActiveSnapshot, @@ -1687,7 +1688,8 @@ _SPI_pquery(QueryDesc *queryDesc, long tcount) switch (operation) { case CMD_SELECT: - if (queryDesc->plannedstmt->into) /* select into table? */ + Assert(queryDesc->plannedstmt->utilityStmt == NULL); + if (queryDesc->plannedstmt->intoClause) /* select into table? */ res = SPI_OK_SELINTO; else if (queryDesc->dest->mydest != DestSPI) { |