diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-12-06 23:55:19 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-12-06 23:55:19 +0000 |
| commit | 73d2a3595a3d14e64cb4dbcc09e90308a486e79f (patch) | |
| tree | a0fd394b68e558c62dbf69bec6706651f98663ec /src/backend/rewrite/rewriteHandler.c | |
| parent | db0de2241dba1663aaa2fe11018b8d7885d116bf (diff) | |
| download | postgresql-73d2a3595a3d14e64cb4dbcc09e90308a486e79f.tar.gz postgresql-73d2a3595a3d14e64cb4dbcc09e90308a486e79f.zip | |
Clean up handling of FOR UPDATE inside views and subselects ... make it
work where we can (given that the executor only handles it at top level)
and generate an error where we can't. Note that while the parser has
been allowing views to say SELECT FOR UPDATE for a few weeks now, that
hasn't actually worked until just now.
Diffstat (limited to 'src/backend/rewrite/rewriteHandler.c')
| -rw-r--r-- | src/backend/rewrite/rewriteHandler.c | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index 6b842582b43..21372e0794d 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.84 2000/12/05 19:15:09 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.85 2000/12/06 23:55:18 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -31,9 +31,6 @@ #include "utils/lsyscache.h" -extern void CheckSelectForUpdate(Query *rule_action); /* in analyze.c */ - - static RewriteInfo *gatherRewriteMeta(Query *parsetree, Query *rule_action, Node *rule_qual, @@ -101,29 +98,6 @@ gatherRewriteMeta(Query *parsetree, PRS2_OLD_VARNO + rt_length, rt_index, 0); /* - * Update resultRelation too ... perhaps this should be done by - * Offset/ChangeVarNodes? - */ - if (sub_action->resultRelation) - { - int result_reln; - int new_result_reln; - - result_reln = sub_action->resultRelation; - switch (result_reln) - { - case PRS2_OLD_VARNO: - new_result_reln = rt_index; - break; - case PRS2_NEW_VARNO: - default: - new_result_reln = result_reln + rt_length; - break; - } - sub_action->resultRelation = new_result_reln; - } - - /* * We want the main parsetree's rtable to end up as the concatenation * of its original contents plus those of all the relevant rule * actions. Also store same into all the rule_action rtables. @@ -336,8 +310,6 @@ ApplyRetrieveRule(Query *parsetree, { Index innerrti = 1; - CheckSelectForUpdate(rule_action); - /* * Remove the view from the list of rels that will actually be * marked FOR UPDATE by the executor. It will still be access- |