From 46379d6e60f0f95e127a5045ca1fa74dfdc48a85 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 23 Jun 2007 22:12:52 +0000 Subject: 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). --- src/backend/parser/parse_expr.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/backend/parser/parse_expr.c') diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index da4bcf208f9..754e18d687c 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.220 2007/06/11 22:22:42 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.221 2007/06/23 22:12:51 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1120,19 +1120,15 @@ transformCaseExpr(ParseState *pstate, CaseExpr *c) static Node * transformSubLink(ParseState *pstate, SubLink *sublink) { - List *qtrees; - Query *qtree; Node *result = (Node *) sublink; + Query *qtree; /* If we already transformed this node, do nothing */ if (IsA(sublink->subselect, Query)) return result; pstate->p_hasSubLinks = true; - qtrees = parse_sub_analyze(sublink->subselect, pstate); - if (list_length(qtrees) != 1) - elog(ERROR, "bad query in sub-select"); - qtree = (Query *) linitial(qtrees); + qtree = parse_sub_analyze(sublink->subselect, pstate); if (qtree->commandType != CMD_SELECT || qtree->utilityStmt != NULL || qtree->intoClause != NULL) -- cgit v1.2.3