Handle reset of the context correctly

babelfish-for-postgresql · Nov 11, 2024 · d861957 · d861957
1 parent 6237170
commit d861957
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
@@ -1157,6 +1157,10 @@ preprocess_expression(PlannerInfo *root, Node *expr, int kind)
 	if (kind != EXPRKIND_RTFUNC)
 		expr = eval_const_expressions(root, expr);
 
+	/* Reset context of expression */
+	if(EXPRKIND_TARGET == kind && planner_node_transformer_hook)
+		(void) planner_node_transformer_hook(root, NULL, -1);
+
 	/*
 	 * If it's a qual or havingQual, canonicalize it.
 	 */
@@ -1169,10 +1173,6 @@ preprocess_expression(PlannerInfo *root, Node *expr, int kind)
 		pprint(expr);
 #endif
 
-	/* Reset context of expression */
-	if(EXPRKIND_TARGET == kind && planner_node_transformer_hook)
-		expr = planner_node_transformer_hook(root, NULL, -1);
-
 	}
 
 	/*