From e18857998f5c8dfb2c8eafd2fed42b44eaeec35a Mon Sep 17 00:00:00 2001 From: Ibrahim Halatci Date: Mon, 23 Jun 2025 13:35:54 +0000 Subject: [PATCH] address couple of Colm's comments and also to enable compilation and tests --- src/backend/distributed/deparser/ruleutils_16.c | 3 +-- src/backend/distributed/planner/insert_select_planner.c | 5 ----- .../sql/{indirections.sql => multi_update_select.sql} | 0 3 files changed, 1 insertion(+), 7 deletions(-) rename src/test/regress/sql/{indirections.sql => multi_update_select.sql} (100%) diff --git a/src/backend/distributed/deparser/ruleutils_16.c b/src/backend/distributed/deparser/ruleutils_16.c index 91eeb4b76..b0eadc281 100644 --- a/src/backend/distributed/deparser/ruleutils_16.c +++ b/src/backend/distributed/deparser/ruleutils_16.c @@ -3558,8 +3558,7 @@ get_update_query_targetlist_def(Query *query, List *targetList, else if (!tle->resjunk) { int paramid = 0; - if (saw_junk) - elog(ERROR, "out of order target list"); + Assert(!saw_junk) paramid = GetParamId((Node *) tle->expr); if (paramid < previous_paramid) diff --git a/src/backend/distributed/planner/insert_select_planner.c b/src/backend/distributed/planner/insert_select_planner.c index d100b8f74..3bf0bb327 100644 --- a/src/backend/distributed/planner/insert_select_planner.c +++ b/src/backend/distributed/planner/insert_select_planner.c @@ -1082,11 +1082,6 @@ ReorderInsertSelectTargetLists(Query *originalQuery, RangeTblEntry *insertRte, TargetEntry *newSubqueryTargetEntry = NULL; AttrNumber originalAttrNo = get_attnum(insertRelationId, oldInsertTargetEntry->resname); - Node *expr; - - /* we need to explore the underlying expression */ - expr = (Node *) oldInsertTargetEntry->expr; - expr = strip_implicit_coercions(expr); /* we need to explore the underlying expression */ Node *expr = strip_implicit_coercions((Node *) oldInsertTargetEntry->expr); diff --git a/src/test/regress/sql/indirections.sql b/src/test/regress/sql/multi_update_select.sql similarity index 100% rename from src/test/regress/sql/indirections.sql rename to src/test/regress/sql/multi_update_select.sql