diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-09-29 18:21:41 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-09-29 18:21:41 +0000 |
| commit | 3a94e789f5c9537d804210be3cb26f7fb08e3b9e (patch) | |
| tree | f1eac12405e3c0ded881d7dd7e59cec35b30c335 /src/backend/rewrite/rewriteRemove.c | |
| parent | 6f64c2e54a0b14154a335249f4dca91a39c61c50 (diff) | |
| download | postgresql-3a94e789f5c9537d804210be3cb26f7fb08e3b9e.tar.gz postgresql-3a94e789f5c9537d804210be3cb26f7fb08e3b9e.zip | |
Subselects in FROM clause, per ISO syntax: FROM (SELECT ...) [AS] alias.
(Don't forget that an alias is required.) Views reimplemented as expanding
to subselect-in-FROM. Grouping, aggregates, DISTINCT in views actually
work now (he says optimistically). No UNION support in subselects/views
yet, but I have some ideas about that. Rule-related permissions checking
moved out of rewriter and into executor.
INITDB REQUIRED!
Diffstat (limited to 'src/backend/rewrite/rewriteRemove.c')
| -rw-r--r-- | src/backend/rewrite/rewriteRemove.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c index 2af77853c46..ba409f4fbf6 100644 --- a/src/backend/rewrite/rewriteRemove.c +++ b/src/backend/rewrite/rewriteRemove.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.39 2000/09/12 04:49:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.40 2000/09/29 18:21:24 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -40,14 +40,14 @@ RewriteGetRuleEventRel(char *rulename) PointerGetDatum(rulename), 0, 0, 0); if (!HeapTupleIsValid(htup)) - elog(ERROR, "Rule or view '%s' not found", - ((!strncmp(rulename, "_RET", 4)) ? (rulename + 4) : rulename)); + elog(ERROR, "Rule or view \"%s\" not found", + ((strncmp(rulename, "_RET", 4) == 0) ? (rulename + 4) : rulename)); eventrel = ((Form_pg_rewrite) GETSTRUCT(htup))->ev_class; htup = SearchSysCacheTuple(RELOID, PointerGetDatum(eventrel), 0, 0, 0); if (!HeapTupleIsValid(htup)) - elog(ERROR, "Class '%u' not found", eventrel); + elog(ERROR, "Relation %u not found", eventrel); return NameStr(((Form_pg_class) GETSTRUCT(htup))->relname); } @@ -85,7 +85,7 @@ RemoveRewriteRule(char *ruleName) if (!HeapTupleIsValid(tuple)) { heap_close(RewriteRelation, RowExclusiveLock); - elog(ERROR, "Rule '%s' not found\n", ruleName); + elog(ERROR, "Rule \"%s\" not found", ruleName); } /* @@ -105,7 +105,7 @@ RemoveRewriteRule(char *ruleName) /* do not allow the removal of a view's SELECT rule */ if (event_relation->rd_rel->relkind == RELKIND_VIEW && - ((Form_pg_rewrite) GETSTRUCT(tuple))->ev_type == '1' ) + ((Form_pg_rewrite) GETSTRUCT(tuple))->ev_type == '1' ) elog(ERROR, "Cannot remove a view's SELECT rule"); hasMoreRules = event_relation->rd_rules != NULL && @@ -133,7 +133,7 @@ RemoveRewriteRule(char *ruleName) * new rule set. Therefore, must do this even if relhasrules is * still true! */ - setRelhasrulesInRelation(eventRelationOid, hasMoreRules); + SetRelationRuleStatus(eventRelationOid, hasMoreRules, false); /* Close rel, but keep lock till commit... */ heap_close(event_relation, NoLock); |