Merge pull request #254 from postgrespro/PGPRO-7080

kovdb75 · web-flow · commit 64a4a2bfebb6 · 2022-09-22T01:16:01.000+03:00
PGPRO-6148, PGPRO-7080: Use common macro for all PG versions instead of add_vars_to_targetlist() function
diff --git a/src/compat/rowmarks_fix.c b/src/compat/rowmarks_fix.c
@@ -47,7 +47,7 @@ append_tle_for_rowmark(PlannerInfo *root, PlanRowMark *rc)
 
 	root->processed_tlist = lappend(root->processed_tlist, tle);
 
-	add_vars_to_targetlist(root, list_make1(var), bms_make_singleton(0), true);
+	add_vars_to_targetlist_compat(root, list_make1(var), bms_make_singleton(0));
 }
 
 
diff --git a/src/include/compat/rowmarks_fix.h b/src/include/compat/rowmarks_fix.h
@@ -45,5 +45,17 @@ void append_tle_for_rowmark(PlannerInfo *root, PlanRowMark *rc);
 
 #endif
 
+/*
+ * add_vars_to_targetlist()
+ * In >=16 last argument was removed (b3ff6c742f6c)
+ */
+#if PG_VERSION_NUM >= 160000
+#define add_vars_to_targetlist_compat(root, vars, where_needed) \
+	add_vars_to_targetlist((root), (vars), (where_needed));
+#else
+#define add_vars_to_targetlist_compat(root, vars, where_needed) \
+	add_vars_to_targetlist((root), (vars), (where_needed), true);
+#endif
+
 
 #endif /* ROWMARKS_FIX_H */

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ append_tle_for_rowmark(PlannerInfo root, PlanRowMark rc)`
`47`	`47`
`48`	`48`	`root->processed_tlist = lappend(root->processed_tlist, tle);`
`49`	`49`
`50`		`- add_vars_to_targetlist(root, list_make1(var), bms_make_singleton(0), true);`
	`50`	`+ add_vars_to_targetlist_compat(root, list_make1(var), bms_make_singleton(0));`
`51`	`51`	`}`
`52`	`52`
`53`	`53`