fix CustomEvalParamExternCompat(), many thanks to Alexander Kuzmenkov

funbringer · funbringer · commit 906dafbd8618 · 2018-09-11T16:56:32.000+03:00
diff --git a/src/include/compat/pg_compat.h b/src/include/compat/pg_compat.h
@@ -864,15 +864,15 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
 
 /* See ExecEvalParamExtern() */
 static inline ParamExternData *
-CustomEvalParamExternCompat(Param *param, ParamListInfo params)
+CustomEvalParamExternCompat(Param *param,
+							ParamListInfo params,
+							ParamExternData *prmdata)
 {
 	ParamExternData *prm;
 
 #if PG_VERSION_NUM >= 110000
-	ParamExternData prmdata;
-
 	if (params->paramFetch != NULL)
-		prm = params->paramFetch(params, param->paramid, false, &prmdata);
+		prm = params->paramFetch(params, param->paramid, false, prmdata);
 	else
 		prm = &params->params[param->paramid - 1];
 #else
diff --git a/src/planner_tree_modification.c b/src/planner_tree_modification.c
@@ -971,7 +971,10 @@ eval_extern_params_mutator(Node *node, ParamListInfo params)
 			param->paramid > 0 &&
 			param->paramid <= params->numParams)
 		{
-			ParamExternData *prm = CustomEvalParamExternCompat(param, params);
+			ParamExternData		prmdata; /* storage for 'prm' (PG 11) */
+			ParamExternData	   *prm = CustomEvalParamExternCompat(param,
+																  params,
+																  &prmdata);
 
 			if (OidIsValid(prm->ptype))
 			{

Original file line number	Diff line number	Diff line change
`@@ -971,7 +971,10 @@ eval_extern_params_mutator(Node *node, ParamListInfo params)`
`971`	`971`	`param->paramid > 0 &&`
`972`	`972`	`param->paramid <= params->numParams)`
`973`	`973`	`{`
`974`		`- ParamExternData *prm = CustomEvalParamExternCompat(param, params);`
	`974`	`+ ParamExternData prmdata; /* storage for 'prm' (PG 11) */`
	`975`	`+ ParamExternData *prm = CustomEvalParamExternCompat(param,`
	`976`	`+ params,`
	`977`	`+ &prmdata);`
`975`	`978`
`976`	`979`	`if (OidIsValid(prm->ptype))`
`977`	`980`	`{`