aboutsummaryrefslogtreecommitdiff
path: root/src/backend/parser/parse_clause.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2007-06-23 22:12:52 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2007-06-23 22:12:52 +0000
commit46379d6e60f0f95e127a5045ca1fa74dfdc48a85 (patch)
tree7d6fe8004575203b40a38184c154dc7f34a20345 /src/backend/parser/parse_clause.c
parentec0bb02db8452d4098023f82b100ba68d8f7dfab (diff)
downloadpostgresql-46379d6e60f0f95e127a5045ca1fa74dfdc48a85.tar.gz
postgresql-46379d6e60f0f95e127a5045ca1fa74dfdc48a85.zip
Separate parse-analysis for utility commands out of parser/analyze.c
(which now deals only in optimizable statements), and put that code into a new file parser/parse_utilcmd.c. This helps clarify and enforce the design rule that utility statements shouldn't be processed during the regular parse analysis phase; all interpretation of their meaning should happen after they are given to ProcessUtility to execute. (We need this because we don't retain any locks for a utility statement that's in a plan cache, nor have any way to detect that it's stale.) We are also able to simplify the API for parse_analyze() and related routines, because they will now always return exactly one Query structure. In passing, fix bug #3403 concerning trying to add a serial column to an existing temp table (this is largely Heikki's work, but we needed all that restructuring to make it safe).
Diffstat (limited to 'src/backend/parser/parse_clause.c')
-rw-r--r--src/backend/parser/parse_clause.c22
1 files changed, 7 insertions, 15 deletions
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 4c1fb0cc4c1..28717020e34 100644
--- 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.165 2007/04/27 22:05:48 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.166 2007/06/23 22:12:51 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -152,8 +152,8 @@ setTargetTable(ParseState *pstate, RangeVar *relation,
* Open target rel and grab suitable lock (which we will hold till end of
* transaction).
*
- * analyze.c will eventually do the corresponding heap_close(), but *not*
- * release the lock.
+ * free_parsestate() will eventually do the corresponding
+ * heap_close(), but *not* release the lock.
*/
pstate->p_target_relation = heap_openrv(relation, RowExclusiveLock);
@@ -193,7 +193,7 @@ setTargetTable(ParseState *pstate, RangeVar *relation,
* Simplify InhOption (yes/no/default) into boolean yes/no.
*
* The reason we do things this way is that we don't want to examine the
- * SQL_inheritance option flag until parse_analyze is run. Otherwise,
+ * SQL_inheritance option flag until parse_analyze() is run. Otherwise,
* we'd do the wrong thing with query strings that intermix SET commands
* with queries.
*/
@@ -417,7 +417,6 @@ transformTableEntry(ParseState *pstate, RangeVar *r)
static RangeTblEntry *
transformRangeSubselect(ParseState *pstate, RangeSubselect *r)
{
- List *parsetrees;
Query *query;
RangeTblEntry *rte;
@@ -434,19 +433,12 @@ transformRangeSubselect(ParseState *pstate, RangeSubselect *r)
/*
* Analyze and transform the subquery.
*/
- parsetrees = parse_sub_analyze(r->subquery, pstate);
+ query = parse_sub_analyze(r->subquery, pstate);
/*
- * Check that we got something reasonable. Most of these conditions are
- * probably impossible given restrictions of the grammar, but check 'em
- * anyway.
+ * Check that we got something reasonable. Many of these conditions are
+ * impossible given restrictions of the grammar, but check 'em anyway.
*/
- if (list_length(parsetrees) != 1)
- elog(ERROR, "unexpected parse analysis result for subquery in FROM");
- query = (Query *) linitial(parsetrees);
- if (query == NULL || !IsA(query, Query))
- elog(ERROR, "unexpected parse analysis result for subquery in FROM");
-
if (query->commandType != CMD_SELECT ||
query->utilityStmt != NULL)
elog(ERROR, "expected SELECT query from subquery in FROM");