diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-11-05 23:24:27 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-11-05 23:24:27 +0000 |
| commit | 593f4b854a8bb384547b8fa9854c73dcd88d4876 (patch) | |
| tree | 7df8238f7a7eac1e4afcb11840b1f01e6abd2eb1 /src/backend/rewrite/rewriteManip.c | |
| parent | 45d7e04fce5c00b1242787bc0fc150f9ecaf029e (diff) | |
Don't treat NEW and OLD as reserved words anymore. For the purposes of rules
it works just as well to have them be ordinary identifiers, and this gets rid
of a number of ugly special cases. Plus we aren't interfering with non-rule
usage of these names.
catversion bump because the names change internally in stored rules.
Diffstat (limited to 'src/backend/rewrite/rewriteManip.c')
| -rw-r--r-- | src/backend/rewrite/rewriteManip.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c index b450fec5027..b8f64c7dcd2 100644 --- a/src/backend/rewrite/rewriteManip.c +++ b/src/backend/rewrite/rewriteManip.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/rewrite/rewriteManip.c,v 1.124 2009/10/26 02:26:38 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/rewrite/rewriteManip.c,v 1.125 2009/11/05 23:24:24 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -940,15 +940,15 @@ getInsertSelectQuery(Query *parsetree, Query ***subquery_ptr) /* * Currently, this is ONLY applied to rule-action queries, and so we - * expect to find the *OLD* and *NEW* placeholder entries in the given + * expect to find the OLD and NEW placeholder entries in the given * query. If they're not there, it must be an INSERT/SELECT in which * they've been pushed down to the SELECT. */ if (list_length(parsetree->rtable) >= 2 && strcmp(rt_fetch(PRS2_OLD_VARNO, parsetree->rtable)->eref->aliasname, - "*OLD*") == 0 && + "old") == 0 && strcmp(rt_fetch(PRS2_NEW_VARNO, parsetree->rtable)->eref->aliasname, - "*NEW*") == 0) + "new") == 0) return parsetree; Assert(parsetree->jointree && IsA(parsetree->jointree, FromExpr)); if (list_length(parsetree->jointree->fromlist) != 1) @@ -962,9 +962,9 @@ getInsertSelectQuery(Query *parsetree, Query ***subquery_ptr) elog(ERROR, "expected to find SELECT subquery"); if (list_length(selectquery->rtable) >= 2 && strcmp(rt_fetch(PRS2_OLD_VARNO, selectquery->rtable)->eref->aliasname, - "*OLD*") == 0 && + "old") == 0 && strcmp(rt_fetch(PRS2_NEW_VARNO, selectquery->rtable)->eref->aliasname, - "*NEW*") == 0) + "new") == 0) { if (subquery_ptr) *subquery_ptr = &(selectrte->subquery); |