database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-13 07:41:39 +03:00
Code Activity

Clean up the mess around EXPLAIN and materialized views.

Browse Source 
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:
Tom Lane
2013-04-12 19:25:20 -04:00
parent 5003f94f66
commit 0b33790421
26 changed files with 231 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/backend/parser/parse_clause.c
View File

@ -244,13 +244,12 @@ interpretInhOption(InhOption inhOpt)
* parsing the query string because the return value can depend upon the
* default_with_oids GUC var.
*
* Materialized views are handled here rather than reloptions.c because that
* code explicitly punts checking for oids to here. We prohibit any explicit
* specification of the oids option for a materialized view, and indicate that
* oids are not needed if we don't get an error.
* In some situations, we want to reject an OIDS option even if it's present.
* That's (rather messily) handled here rather than reloptions.c, because that
* code explicitly punts checking for oids to here.
*/
bool
interpretOidsOption(List *defList, char relkind)
interpretOidsOption(List *defList, bool allowOids)
{
ListCell *cell;
@ -262,16 +261,17 @@ interpretOidsOption(List *defList, char relkind)
if (def->defnamespace == NULL &&
pg_strcasecmp(def->defname, "oids") == 0)
{
if (relkind == RELKIND_MATVIEW)
if (!allowOids)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("unrecognized parameter \"%s\"", "oids")));
errmsg("unrecognized parameter \"%s\"",
def->defname)));
return defGetBoolean(def);
}
}
if (relkind == RELKIND_MATVIEW)
/* Force no-OIDS result if caller disallows OIDS. */
if (!allowOids)
return false;
/* OIDS option was not specified, so use default. */