From f849487cb37f8c67018bffe2658360965a450ea7 Mon Sep 17 00:00:00 2001 From: Marco Slot Date: Mon, 25 Jul 2022 12:48:50 +0200 Subject: [PATCH] Fix issue with GROUP BY + DEFAULT --- src/backend/distributed/planner/insert_select_planner.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/backend/distributed/planner/insert_select_planner.c b/src/backend/distributed/planner/insert_select_planner.c index c861c1e9a..655f7ebcb 100644 --- a/src/backend/distributed/planner/insert_select_planner.c +++ b/src/backend/distributed/planner/insert_select_planner.c @@ -48,6 +48,7 @@ #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/rel.h" +#include static void PrepareInsertSelectForCitusPlanner(Query *insertSelectQuery); @@ -958,6 +959,7 @@ ReorderInsertSelectTargetLists(Query *originalQuery, RangeTblEntry *insertRte, ListCell *insertTargetEntryCell; List *newSubqueryTargetlist = NIL; List *newInsertTargetlist = NIL; + List *columnNameList = NIL; int resno = 1; Index selectTableId = 2; int targetEntryIndex = 0; @@ -1029,6 +1031,9 @@ ReorderInsertSelectTargetLists(Query *originalQuery, RangeTblEntry *insertRte, newSubqueryTargetEntry); } + String *columnName = makeString(newSubqueryTargetEntry->resname); + columnNameList = lappend(columnNameList, columnName); + /* * The newly created select target entry cannot be a junk entry since junk * entries are not in the final target list and we're processing the @@ -1080,6 +1085,7 @@ ReorderInsertSelectTargetLists(Query *originalQuery, RangeTblEntry *insertRte, originalQuery->targetList = newInsertTargetlist; subquery->targetList = newSubqueryTargetlist; + subqueryRte->eref->colnames = columnNameList; return NULL; }