diff options
Diffstat (limited to 'src/backend/rewrite/rewriteHandler.c')
| -rw-r--r-- | src/backend/rewrite/rewriteHandler.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index 31b25957b60..a332611a586 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -52,7 +52,8 @@ static TargetEntry *process_matched_tle(TargetEntry *src_tle, static Node *get_assignment_input(Node *node); static void rewriteValuesRTE(RangeTblEntry *rte, Relation target_relation, List *attrnos); -static void rewriteTargetListUD(Query *parsetree, Relation target_relation); +static void rewriteTargetListUD(Query *parsetree, RangeTblEntry *target_rte, + Relation target_relation); static void markQueryForLocking(Query *qry, Node *jtnode, bool forUpdate, bool noWait, bool pushedDown); static List *matchLocks(CmdType event, RuleLock *rulelocks, @@ -1110,7 +1111,8 @@ rewriteValuesRTE(RangeTblEntry *rte, Relation target_relation, List *attrnos) * ordering isn't actually critical at the moment. */ static void -rewriteTargetListUD(Query *parsetree, Relation target_relation) +rewriteTargetListUD(Query *parsetree, RangeTblEntry *target_rte, + Relation target_relation) { Var *var; const char *attrname; @@ -1135,11 +1137,9 @@ rewriteTargetListUD(Query *parsetree, Relation target_relation) * Emit whole-row Var so that executor will have the "old" view row * to pass to the INSTEAD OF trigger. */ - var = makeVar(parsetree->resultRelation, - InvalidAttrNumber, - RECORDOID, - -1, - 0); + var = makeWholeRowVar(target_rte, + parsetree->resultRelation, + 0); attrname = "wholerow"; } @@ -1858,11 +1858,11 @@ RewriteQuery(Query *parsetree, List *rewrite_events) else if (event == CMD_UPDATE) { rewriteTargetListIU(parsetree, rt_entry_relation, NULL); - rewriteTargetListUD(parsetree, rt_entry_relation); + rewriteTargetListUD(parsetree, rt_entry, rt_entry_relation); } else if (event == CMD_DELETE) { - rewriteTargetListUD(parsetree, rt_entry_relation); + rewriteTargetListUD(parsetree, rt_entry, rt_entry_relation); } else elog(ERROR, "unrecognized commandType: %d", (int) event); |