summaryrefslogtreecommitdiff
path: root/src/backend/optimizer/plan/planner.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/optimizer/plan/planner.c')
-rw-r--r--src/backend/optimizer/plan/planner.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index ea37ba887ff..8db98466ede 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -1486,7 +1486,7 @@ grouping_planner(PlannerInfo *root, bool inheritance_update,
double tuple_fraction)
{
Query *parse = root->parse;
- List *tlist = parse->targetList;
+ List *tlist;
int64 offset_est = 0;
int64 count_est = 0;
double limit_tuples = -1.0;
@@ -1616,13 +1616,7 @@ grouping_planner(PlannerInfo *root, bool inheritance_update,
}
/* Preprocess targetlist */
- tlist = preprocess_targetlist(root, tlist);
-
- if (parse->onConflict)
- parse->onConflict->onConflictSet =
- preprocess_onconflict_targetlist(parse->onConflict->onConflictSet,
- parse->resultRelation,
- parse->rtable);
+ tlist = preprocess_targetlist(root);
/*
* We are now done hacking up the query's targetlist. Most of the