Modify processing of DECLARE CURSOR and EXPLAIN so that they can resolve the

[postgresql] / src / backend / parser / parse_clause.c

diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 0c718adc32a5f7cd19b457179da58f5fc103c36b..4c1fb0cc4c12295c596193a9efeafe8478775edd 100644 (file)
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.164 2007/02/01 19:10:27 momjian Exp $
+ *       $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.165 2007/04/27 22:05:48 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -447,9 +447,10 @@ transformRangeSubselect(ParseState *pstate, RangeSubselect *r)
        if (query == NULL || !IsA(query, Query))
                elog(ERROR, "unexpected parse analysis result for subquery in FROM");
 
-       if (query->commandType != CMD_SELECT)
+       if (query->commandType != CMD_SELECT ||
+               query->utilityStmt != NULL)
                elog(ERROR, "expected SELECT query from subquery in FROM");
-       if (query->into != NULL)
+       if (query->intoClause != NULL)
                ereport(ERROR,
                                (errcode(ERRCODE_SYNTAX_ERROR),
                                 errmsg("subquery in FROM cannot have SELECT INTO")));