fixes for REL_10_BETA2

Author: funbringer

src/include/compat/pg_compat.h

@@ -22,6 +22,7 @@
 #include "compat/debug_compat_features.h"
 
 #include "postgres.h"
+#include "commands/trigger.h"
 #include "executor/executor.h"
 #include "nodes/memnodes.h"
 #include "nodes/relation.h"
@@ -562,6 +563,33 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
 #endif
 
 
+/*
+ * ExecARInsertTriggers()
+ */
+#if PG_VERSION_NUM >= 100000
+#define ExecARInsertTriggersCompat(estate, relinfo, trigtuple, \
+								   recheck_indexes, transition_capture) \
+	ExecARInsertTriggers((estate), (relinfo), (trigtuple), \
+						 (recheck_indexes), (transition_capture))
+#elif PG_VERSION_NUM >= 90500
+#define ExecARInsertTriggersCompat(estate, relinfo, trigtuple, \
+								   recheck_indexes, transition_capture) \
+	ExecARInsertTriggers((estate), (relinfo), (trigtuple), (recheck_indexes))
+#endif
+
+
+/*
+ * ExecASInsertTriggers()
+ */
+#if PG_VERSION_NUM >= 100000
+#define ExecASInsertTriggersCompat(estate, relinfo, transition_capture) \
+	ExecASInsertTriggers((estate), (relinfo), (transition_capture))
+#elif PG_VERSION_NUM >= 90500
+#define ExecASInsertTriggersCompat(estate, relinfo, transition_capture) \
+	ExecASInsertTriggers((estate), (relinfo))
+#endif
+
+
 
 /*
  * -------------

src/utility_stmt_hooking.c

@@ -722,9 +722,9 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel,
 				recheckIndexes = ExecInsertIndexTuples(slot, &(tuple->t_self),
 													   estate, false, NULL, NIL);
 
-			/* AFTER ROW INSERT Triggers */
-			ExecARInsertTriggers(estate, child_result_rel, tuple,
-								 recheckIndexes);
+			/* AFTER ROW INSERT Triggers (FIXME: NULL transition) */
+			ExecARInsertTriggersCompat(estate, child_result_rel, tuple,
+									   recheckIndexes, NULL);
 
 			list_free(recheckIndexes);
 
@@ -746,8 +746,8 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel,
 	if (old_protocol)
 		pq_endmsgread();
 
-	/* Execute AFTER STATEMENT insertion triggers */
-	ExecASInsertTriggers(estate, parent_result_rel);
+	/* Execute AFTER STATEMENT insertion triggers (FIXME: NULL transition) */
+	ExecASInsertTriggersCompat(estate, parent_result_rel, NULL);
 
 	/* Handle queued AFTER triggers */
 	AfterTriggerEndQuery(estate);