restore compatibility with PG 11

funbringer · funbringer · commit 4abee5cbc116 · 2018-08-29T14:53:31.000+03:00
diff --git a/src/include/compat/pg_compat.h b/src/include/compat/pg_compat.h
@@ -685,6 +685,22 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
 #endif
 
 
+/*
+ * ExecBRDeleteTriggers()
+ */
+#if PG_VERSION_NUM >= 110000
+#define ExecBRDeleteTriggersCompat(estate, epqstate, relinfo, tupleid, \
+								   fdw_trigtuple, epqslot) \
+	ExecBRDeleteTriggers((estate), (epqstate), (relinfo), (tupleid), \
+						 (fdw_trigtuple), (epqslot))
+#else
+#define ExecBRDeleteTriggersCompat(estate, epqstate, relinfo, tupleid, \
+								   fdw_trigtuple, epqslot) \
+	ExecBRDeleteTriggers((estate), (epqstate), (relinfo), (tupleid), \
+						 (fdw_trigtuple))
+#endif
+
+
 /*
  * ExecARDeleteTriggers()
  */
diff --git a/src/partition_router.c b/src/partition_router.c
@@ -266,7 +266,7 @@ router_delete_tuple(TupleTableSlot *slot,
 	if (rri->ri_TrigDesc &&
 		rri->ri_TrigDesc->trig_delete_before_row)
 	{
-		if (!ExecBRDeleteTriggers(estate, epqstate, rri, tupleid, NULL))
+		if (!ExecBRDeleteTriggersCompat(estate, epqstate, rri, tupleid, NULL, NULL))
 			return NULL;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ router_delete_tuple(TupleTableSlot *slot,`
`266`	`266`	`if (rri->ri_TrigDesc &&`
`267`	`267`	`rri->ri_TrigDesc->trig_delete_before_row)`
`268`	`268`	`{`
`269`		`- if (!ExecBRDeleteTriggers(estate, epqstate, rri, tupleid, NULL))`
	`269`	`+ if (!ExecBRDeleteTriggersCompat(estate, epqstate, rri, tupleid, NULL, NULL))`
`270`	`270`	`return NULL;`
`271`	`271`	`}`
`272`	`272`