Commitcbbf906

committed

Fix func signature change in minor pgpro releases, arrgh.

1 parent7258169 commitcbbf906Copy full SHA for cbbf906

File tree

+23

-11

lines changed

+23

-11

lines changed

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -992,7 +992,19 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,`
`992`	`992`	`AddRelationNewConstraints((rel), (newColDefaults), (newConstrains), (allow_merge), (is_local), (is_internal))`
`993`	`993`	`#endif`
`994`	`994`
`995`		`-`
	`995`	`+/*`
	`996`	`+ * [PGPRO-3725] Since 11.7 and 12.1 in pgpro standard and ee PGPRO-2843`
	`997`	`+ * appeared, changing the signature, wow. It is not present in pgpro 1c`
	`998`	`+ * though; PG_VERSION_STR is defined in std and ee but not in 1c, so it is`
	`999`	`+ * hackishly used for distinguishing them.`
	`1000`	`+ */`
	`1001`	`+#if defined(PGPRO_VERSION_STR)&& (PG_VERSION_NUM >=110006)`
	`1002`	`+#defineexpression_tree_mutator_compat(node,mutator,context) \`
	`1003`	`+expression_tree_mutator((node), (mutator), (context), 0)`
	`1004`	`+#else`
	`1005`	`+#defineexpression_tree_mutator_compat(node,mutator,context) \`
	`1006`	`+expression_tree_mutator((node), (mutator), (context))`
	`1007`	`+#endif`
`996`	`1008`
`997`	`1009`	`/*`
`998`	`1010`	`* -------------`

Lines changed: 1 addition & 1 deletion

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`		`-returnexpression_tree_mutator(node,canonicalize_custom_exprs_mutator,NULL);`
	`376`	`+returnexpression_tree_mutator_compat(node,canonicalize_custom_exprs_mutator,NULL);`
`377`	`377`	`}`
`378`	`378`
`379`	`379`	`staticList*`

Lines changed: 1 addition & 1 deletion

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`		`-returnexpression_tree_mutator(node,fix_returning_list_mutator,state);`
	`1167`	`+returnexpression_tree_mutator_compat(node,fix_returning_list_mutator,state);`
`1168`	`1168`	`}`
`1169`	`1169`
`1170`	`1170`

Lines changed: 8 additions & 8 deletions

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`	`SubLinksl= (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`		`-returnexpression_tree_mutator(node,`
`719`		`-adjust_appendrel_varnos,`
`720`		`-context);`
	`718`	`+returnexpression_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`		`-returnexpression_tree_mutator(node,eval_extern_params_mutator,`
`1067`		`- (void*)params);`
	`1066`	`+returnexpression_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) */`

Comments

(0)