postgrespro
diff --git a/‎src/include/compat/pg_compat.h
Lines changed: 35 additions & 5 deletions b/‎src/include/compat/pg_compat.h
Lines changed: 35 additions & 5 deletions
diff --git a/‎src/include/partition_router.h
Lines changed: 5 additions & 3 deletions b/‎src/include/partition_router.h
Lines changed: 5 additions & 3 deletions
diff --git a/‎src/include/relation_info.h
Lines changed: 1 addition & 0 deletions b/‎src/include/relation_info.h
Lines changed: 1 addition & 0 deletions
@@ -364,7 +364,6 @@ extern void create_plain_partial_paths(PlannerInfo *root,
 
 /*
  * ExecEvalExpr()
- * NOTE: 'errmsg' specifies error string when ExecEvalExpr returns multiple values.
  */
 #if PG_VERSION_NUM >= 100000
 #define ExecEvalExprCompat(expr, econtext, isNull) \
@@ -384,6 +383,33 @@ ExecEvalExprCompat(ExprState *expr, ExprContext *econtext, bool *isnull)
 #endif
 
 
+/*
+ * ExecCheck()
+ */
+#if PG_VERSION_NUM < 100000
+static inline bool
+ExecCheck(ExprState *state, ExprContext *econtext)
+{
+	Datum			ret;
+	bool			isnull;
+	MemoryContext	old_mcxt;
+
+	/* short-circuit (here and in ExecInitCheck) for empty restriction list */
+	if (state == NULL)
+		return true;
+
+	old_mcxt = MemoryContextSwitchTo(econtext->ecxt_per_tuple_memory);
+	ret = ExecEvalExprCompat(state, econtext, &isnull);
+	MemoryContextSwitchTo(old_mcxt);
+
+	if (isnull)
+		return true;
+
+	return DatumGetBool(ret);
+}
+#endif
+
+
 /*
  * extract_actual_join_clauses()
  */
@@ -790,11 +816,15 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
  * heap_delete()
  */
 #if PG_VERSION_NUM >= 110000
-#define heap_delete_compat(relation, tid, cid, crosscheck, wait, hufd) \
-	heap_delete((relation), (tid), (cid), (crosscheck), (wait), (hufd), false)
+#define heap_delete_compat(relation, tid, cid, crosscheck, \
+						   wait, hufd, changing_part) \
+	heap_delete((relation), (tid), (cid), (crosscheck), \
+				(wait), (hufd), (changing_part))
 #else
-#define heap_delete_compat(relation, tid, cid, crosscheck, wait, hufd) \
-	heap_delete((relation), (tid), (cid), (crosscheck), (wait), (hufd))
+#define heap_delete_compat(relation, tid, cid, crosscheck, \
+						   wait, hufd, changing_part) \
+	heap_delete((relation), (tid), (cid), (crosscheck), \
+				(wait), (hufd))
 #endif
 
 /*
 
@@ -30,13 +30,15 @@ typedef struct PartitionRouterState
 {
 	CustomScanState		css;
 
-	Oid					partitioned_table;
-	Plan			   *subplan;	/* proxy variable to store subplan */
-	JunkFilter		   *junkfilter;	/* 'ctid' extraction facility */
+	Plan			   *subplan;		/* proxy variable to store subplan */
+	JunkFilter		   *junkfilter;		/* 'ctid' extraction facility */
+	ExprState		   *constraint;		/* should tuple remain in partition? */
 
 	EPQState			epqstate;
 	int					epqparam;
 
+	ModifyTableState   *mt_state;		/* need this for a GREAT deal of hackery */
+
 	ResultRelInfo	   *current_rri;
 } PartitionRouterState;
 
 
@@ -367,6 +367,7 @@ void shout_if_prel_is_invalid(const Oid parent_oid,
 							  const PartType expected_part_type);
 
 /* Bounds cache */
+Expr *get_partition_constraint_expr(Oid partition);
 void forget_bounds_of_partition(Oid partition);
 PartBoundInfo *get_bounds_of_partition(Oid partition, const PartRelationInfo *prel);
 void invalidate_bounds_cache(void);