fix evaluation of expressions with PARAMs in handle_modification_query()

Author: funbringer

expected/pathman_param_upd_del.out

@@ -68,6 +68,64 @@ EXPLAIN (COSTS OFF) EXECUTE upd(11);
          Filter: (key = 11)
 (3 rows)
 
+DEALLOCATE upd;
+PREPARE upd(INT4) AS UPDATE param_upd_del.test SET val = val + 1 WHERE key = ($1 + 3) * 2;
+EXPLAIN (COSTS OFF) EXECUTE upd(5);
+         QUERY PLAN         
+----------------------------
+ Update on test_7
+   ->  Seq Scan on test_7
+         Filter: (key = 16)
+(3 rows)
+
+EXPLAIN (COSTS OFF) EXECUTE upd(5);
+         QUERY PLAN         
+----------------------------
+ Update on test_7
+   ->  Seq Scan on test_7
+         Filter: (key = 16)
+(3 rows)
+
+EXPLAIN (COSTS OFF) EXECUTE upd(5);
+         QUERY PLAN         
+----------------------------
+ Update on test_7
+   ->  Seq Scan on test_7
+         Filter: (key = 16)
+(3 rows)
+
+EXPLAIN (COSTS OFF) EXECUTE upd(5);
+         QUERY PLAN         
+----------------------------
+ Update on test_7
+   ->  Seq Scan on test_7
+         Filter: (key = 16)
+(3 rows)
+
+EXPLAIN (COSTS OFF) EXECUTE upd(5);
+         QUERY PLAN         
+----------------------------
+ Update on test_7
+   ->  Seq Scan on test_7
+         Filter: (key = 16)
+(3 rows)
+
+EXPLAIN (COSTS OFF) EXECUTE upd(5);
+         QUERY PLAN         
+----------------------------
+ Update on test_7
+   ->  Seq Scan on test_7
+         Filter: (key = 16)
+(3 rows)
+
+EXPLAIN (COSTS OFF) EXECUTE upd(6);
+         QUERY PLAN         
+----------------------------
+ Update on test_3
+   ->  Seq Scan on test_3
+         Filter: (key = 18)
+(3 rows)
+
 DEALLOCATE upd;
 PREPARE del(INT4) AS DELETE FROM param_upd_del.test WHERE key = $1;
 EXPLAIN (COSTS OFF) EXECUTE del(10);

sql/pathman_param_upd_del.sql

@@ -23,6 +23,17 @@ EXPLAIN (COSTS OFF) EXECUTE upd(11);
 DEALLOCATE upd;
 
 
+PREPARE upd(INT4) AS UPDATE param_upd_del.test SET val = val + 1 WHERE key = ($1 + 3) * 2;
+EXPLAIN (COSTS OFF) EXECUTE upd(5);
+EXPLAIN (COSTS OFF) EXECUTE upd(5);
+EXPLAIN (COSTS OFF) EXECUTE upd(5);
+EXPLAIN (COSTS OFF) EXECUTE upd(5);
+EXPLAIN (COSTS OFF) EXECUTE upd(5);
+EXPLAIN (COSTS OFF) EXECUTE upd(5);
+EXPLAIN (COSTS OFF) EXECUTE upd(6);
+DEALLOCATE upd;
+
+
 PREPARE del(INT4) AS DELETE FROM param_upd_del.test WHERE key = $1;
 EXPLAIN (COSTS OFF) EXECUTE del(10);
 EXPLAIN (COSTS OFF) EXECUTE del(10);

src/planner_tree_modification.c

@@ -374,8 +374,8 @@ static void
 handle_modification_query(Query *parse, transform_query_cxt *context)
 {
 	RangeTblEntry  *rte;
-	Expr		   *quals;
 	Oid				child;
+	Node		   *quals = parse->jointree->quals;
 	Index			result_rti = parse->resultRelation;
 	ParamListInfo	params = context->query_params;
 
@@ -390,14 +390,15 @@ handle_modification_query(Query *parse, transform_query_cxt *context)
 	if (!rte->inh)
 		return;
 
-	quals = (Expr *) eval_const_expressions(NULL, parse->jointree->quals);
-
 	/* Check if we can replace PARAMs with CONSTs */
-	if (params && clause_contains_params((Node *) quals))
-		quals = (Expr *) eval_extern_params_mutator((Node *) quals, params);
+	if (params && clause_contains_params(quals))
+		quals = eval_extern_params_mutator(quals, params);
+
+	/* Evaluate constaint expressions */
+	quals = eval_const_expressions(NULL, quals);
 
 	/* Parse syntax tree and extract deepest partition if possible */
-	child = find_deepest_partition(rte->relid, result_rti, quals);
+	child = find_deepest_partition(rte->relid, result_rti, (Expr *) quals);
 
 	/* Substitute parent table with partition */
 	if (OidIsValid(child))