mirror of
https://github.com/postgres/postgres.git
synced 2025-09-03 15:22:11 +03:00
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.)
This commit is contained in:
@@ -1032,8 +1032,8 @@ _copyIntoClause(const IntoClause *from)
|
||||
COPY_NODE_FIELD(options);
|
||||
COPY_SCALAR_FIELD(onCommit);
|
||||
COPY_STRING_FIELD(tableSpaceName);
|
||||
COPY_NODE_FIELD(viewQuery);
|
||||
COPY_SCALAR_FIELD(skipData);
|
||||
COPY_SCALAR_FIELD(relkind);
|
||||
|
||||
return newnode;
|
||||
}
|
||||
|
@@ -123,8 +123,8 @@ _equalIntoClause(const IntoClause *a, const IntoClause *b)
|
||||
COMPARE_NODE_FIELD(options);
|
||||
COMPARE_SCALAR_FIELD(onCommit);
|
||||
COMPARE_STRING_FIELD(tableSpaceName);
|
||||
COMPARE_NODE_FIELD(viewQuery);
|
||||
COMPARE_SCALAR_FIELD(skipData);
|
||||
COMPARE_SCALAR_FIELD(relkind);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
@@ -2829,6 +2829,9 @@ raw_expression_tree_walker(Node *node,
|
||||
if (walker(into->rel, context))
|
||||
return true;
|
||||
/* colNames, options are deemed uninteresting */
|
||||
/* viewQuery should be null in raw parsetree, but check it */
|
||||
if (walker(into->viewQuery, context))
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
case T_List:
|
||||
|
@@ -893,8 +893,8 @@ _outIntoClause(StringInfo str, const IntoClause *node)
|
||||
WRITE_NODE_FIELD(options);
|
||||
WRITE_ENUM_FIELD(onCommit, OnCommitAction);
|
||||
WRITE_STRING_FIELD(tableSpaceName);
|
||||
WRITE_NODE_FIELD(viewQuery);
|
||||
WRITE_BOOL_FIELD(skipData);
|
||||
WRITE_CHAR_FIELD(relkind);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@@ -394,8 +394,8 @@ _readIntoClause(void)
|
||||
READ_NODE_FIELD(options);
|
||||
READ_ENUM_FIELD(onCommit, OnCommitAction);
|
||||
READ_STRING_FIELD(tableSpaceName);
|
||||
READ_NODE_FIELD(viewQuery);
|
||||
READ_BOOL_FIELD(skipData);
|
||||
READ_CHAR_FIELD(relkind);
|
||||
|
||||
READ_DONE();
|
||||
}
|
||||
|
Reference in New Issue
Block a user