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/rewrite/rewriteDefine.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/rewrite/rewriteDefine.c')
| -rw-r--r-- | src/backend/rewrite/rewriteDefine.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c index 864b00f1e73..e57e2ab046c 100644 --- a/src/backend/rewrite/rewriteDefine.c +++ b/src/backend/rewrite/rewriteDefine.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/rewrite/rewriteDefine.c,v 1.119 2007/03/19 23:38:29 wieck Exp $ + * $PostgreSQL: pgsql/src/backend/rewrite/rewriteDefine.c,v 1.120 2007/04/27 22:05:48 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -294,7 +294,9 @@ DefineQueryRewrite(char *rulename, */ query = (Query *) linitial(action); if (!is_instead || - query->commandType != CMD_SELECT || query->into != NULL) + query->commandType != CMD_SELECT || + query->utilityStmt != NULL || + query->intoClause != NULL) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("rules on SELECT must have action INSTEAD SELECT"))); |