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/commands/view.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/backend/commands/view.c') diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c index 83f26f73ffb..f8dac126439 100644 --- a/src/backend/commands/view.c +++ b/src/backend/commands/view.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/view.c,v 1.100 2007/03/13 00:33:40 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/view.c,v 1.101 2007/06/23 22:12:50 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -351,7 +351,6 @@ UpdateRangeTableOfViewParse(Oid viewOid, Query *viewParse) void DefineView(ViewStmt *stmt, const char *queryString) { - List *stmts; Query *viewParse; Oid viewOid; RangeVar *view; @@ -363,15 +362,12 @@ DefineView(ViewStmt *stmt, const char *queryString) * Since parse analysis scribbles on its input, copy the raw parse tree; * this ensures we don't corrupt a prepared statement, for example. */ - stmts = parse_analyze((Node *) copyObject(stmt->query), - queryString, NULL, 0); + viewParse = parse_analyze((Node *) copyObject(stmt->query), + queryString, NULL, 0); /* * The grammar should ensure that the result is a single SELECT Query. */ - if (list_length(stmts) != 1) - elog(ERROR, "unexpected parse analysis result"); - viewParse = (Query *) linitial(stmts); if (!IsA(viewParse, Query) || viewParse->commandType != CMD_SELECT) elog(ERROR, "unexpected parse analysis result"); -- cgit v1.2.3