From 0b337904213337db5026ef0a756a447588023935 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 12 Apr 2013 19:25:20 -0400 Subject: Clean up the mess around EXPLAIN and materialized views. Revert the matview-related changes in explain.c's API, as per recent complaint from Robert Haas. The reason for these appears to have been principally some ill-considered choices around having intorel_startup do what ought to be parse-time checking, plus a poor arrangement for passing it the view parsetree it needs to store into pg_rewrite when creating a materialized view. Do the latter by having parse analysis stick a copy into the IntoClause, instead of doing it at runtime. (On the whole, I seriously question the choice to represent CREATE MATERIALIZED VIEW as a variant of SELECT INTO/CREATE TABLE AS, because that means injecting even more complexity into what was already a horrid legacy kluge. However, I didn't go so far as to rethink that choice ... yet.) I also moved several error checks into matview parse analysis, and made the check for external Params in a matview more accurate. In passing, clean things up a bit more around interpretOidsOption(), and fix things so that we can use that to force no-oids for views, sequences, etc, thereby eliminating the need to cons up "oids = false" options when creating them. catversion bump due to change in IntoClause. (I wonder though if we really need readfuncs/outfuncs support for IntoClause anymore.) --- src/backend/parser/parse_utilcmd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/backend/parser/parse_utilcmd.c') diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c index 0d2802a576a..46dc6724f47 100644 --- a/src/backend/parser/parse_utilcmd.c +++ b/src/backend/parser/parse_utilcmd.c @@ -199,14 +199,11 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString) { cxt.stmtType = "CREATE FOREIGN TABLE"; cxt.isforeign = true; - cxt.hasoids = interpretOidsOption(stmt->options, - RELKIND_FOREIGN_TABLE); } else { cxt.stmtType = "CREATE TABLE"; cxt.isforeign = false; - cxt.hasoids = interpretOidsOption(stmt->options, RELKIND_RELATION); } cxt.relation = stmt->relation; cxt.rel = NULL; @@ -220,6 +217,7 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString) cxt.blist = NIL; cxt.alist = NIL; cxt.pkey = NULL; + cxt.hasoids = interpretOidsOption(stmt->options, true); Assert(!stmt->ofTypename || !stmt->inhRelations); /* grammar enforces */ -- cgit v1.2.3