Fix func signature change in minor pgpro releases, arrgh.

arssher · arssher · commit cbbf906760cc · 2020-04-08T20:41:02.000+03:00
diff --git a/src/include/compat/pg_compat.h b/src/include/compat/pg_compat.h
@@ -992,7 +992,19 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
 	AddRelationNewConstraints((rel), (newColDefaults), (newConstrains), (allow_merge), (is_local), (is_internal))
 #endif
 
-
+/*
+ * [PGPRO-3725] Since 11.7 and 12.1 in pgpro standard and ee PGPRO-2843
+ * appeared, changing the signature, wow. It is not present in pgpro 1c
+ * though; PG_VERSION_STR is defined in std and ee but not in 1c, so it is
+ * hackishly used for distinguishing them.
+ */
+#if defined(PGPRO_VERSION_STR) && (PG_VERSION_NUM >= 110006)
+#define expression_tree_mutator_compat(node, mutator, context) \
+	expression_tree_mutator((node), (mutator), (context), 0)
+#else
+#define expression_tree_mutator_compat(node, mutator, context) \
+	expression_tree_mutator((node), (mutator), (context))
+#endif
 
 /*
  * -------------
diff --git a/src/nodes_common.c b/src/nodes_common.c
@@ -373,7 +373,7 @@ canonicalize_custom_exprs_mutator(Node *node, void *cxt)
 		return (Node *) var;
 	}
 
-	return expression_tree_mutator(node, canonicalize_custom_exprs_mutator, NULL);
+	return expression_tree_mutator_compat(node, canonicalize_custom_exprs_mutator, NULL);
 }
 
 static List *
diff --git a/src/partition_filter.c b/src/partition_filter.c
@@ -1164,7 +1164,7 @@ fix_returning_list_mutator(Node *node, void *state)
 		return (Node *) var;
 	}
 
-	return expression_tree_mutator(node, fix_returning_list_mutator, state);
+	return expression_tree_mutator_compat(node, fix_returning_list_mutator, state);
 }
 
 
diff --git a/src/planner_tree_modification.c b/src/planner_tree_modification.c
@@ -709,15 +709,15 @@ adjust_appendrel_varnos(Node *node, adjust_appendrel_varnos_cxt *context)
 		SubLink *sl = (SubLink *) node;
 
 		/* Examine its expression */
-		sl->testexpr = expression_tree_mutator(sl->testexpr,
-											   adjust_appendrel_varnos,
-											   context);
+		sl->testexpr = expression_tree_mutator_compat(sl->testexpr,
+													  adjust_appendrel_varnos,
+													  context);
 		return (Node *) sl;
 	}
 
-	return expression_tree_mutator(node,
-								   adjust_appendrel_varnos,
-								   context);
+	return expression_tree_mutator_compat(node,
+										  adjust_appendrel_varnos,
+										  context);
 }
 
 
@@ -1063,8 +1063,8 @@ eval_extern_params_mutator(Node *node, ParamListInfo params)
 		}
 	}
 
-	return expression_tree_mutator(node, eval_extern_params_mutator,
-								   (void *) params);
+	return expression_tree_mutator_compat(node, eval_extern_params_mutator,
+										  (void *) params);
 }
 
 /* Check whether Var translation list is trivial (no shuffle) */

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ canonicalize_custom_exprs_mutator(Node node, void cxt)`
`373`	`373`	`return (Node *) var;`
`374`	`374`	`}`
`375`	`375`
`376`		`- return expression_tree_mutator(node, canonicalize_custom_exprs_mutator, NULL);`
	`376`	`+ return expression_tree_mutator_compat(node, canonicalize_custom_exprs_mutator, NULL);`
`377`	`377`	`}`
`378`	`378`
`379`	`379`	`static List *`
Original file line number	Diff line number	Diff line change
`@@ -1164,7 +1164,7 @@ fix_returning_list_mutator(Node node, void state)`
`1164`	`1164`	`return (Node *) var;`
`1165`	`1165`	`}`
`1166`	`1166`
`1167`		`- return expression_tree_mutator(node, fix_returning_list_mutator, state);`
	`1167`	`+ return expression_tree_mutator_compat(node, fix_returning_list_mutator, state);`
`1168`	`1168`	`}`
`1169`	`1169`
`1170`	`1170`
Original file line number	Diff line number	Diff line change
`@@ -709,15 +709,15 @@ adjust_appendrel_varnos(Node node, adjust_appendrel_varnos_cxt context)`
`709`	`709`	`SubLink sl = (SubLink ) node;`
`710`	`710`
`711`	`711`	`/* Examine its expression */`
`712`		`- sl->testexpr = expression_tree_mutator(sl->testexpr,`
`713`		`- adjust_appendrel_varnos,`
`714`		`- context);`
	`712`	`+ sl->testexpr = expression_tree_mutator_compat(sl->testexpr,`
	`713`	`+ adjust_appendrel_varnos,`
	`714`	`+ context);`
`715`	`715`	`return (Node *) sl;`
`716`	`716`	`}`
`717`	`717`
`718`		`- return expression_tree_mutator(node,`
`719`		`- adjust_appendrel_varnos,`
`720`		`- context);`
	`718`	`+ return expression_tree_mutator_compat(node,`
	`719`	`+ adjust_appendrel_varnos,`
	`720`	`+ context);`
`721`	`721`	`}`
`722`	`722`
`723`	`723`
`@@ -1063,8 +1063,8 @@ eval_extern_params_mutator(Node *node, ParamListInfo params)`
`1063`	`1063`	`}`
`1064`	`1064`	`}`
`1065`	`1065`
`1066`		`- return expression_tree_mutator(node, eval_extern_params_mutator,`
`1067`		`- (void *) params);`
	`1066`	`+ return expression_tree_mutator_compat(node, eval_extern_params_mutator,`
	`1067`	`+ (void *) params);`
`1068`	`1068`	`}`
`1069`	`1069`
`1070`	`1070`	`/* Check whether Var translation list is trivial (no shuffle) */`