Fix compability with pg10 (#123)

Author: ildus

src/include/compat/pg_compat.h

@@ -59,6 +59,16 @@
 	} while (0)
 #endif
 
+/*
+ * CheckValidResultRel()
+ */
+#if PG_VERSION_NUM >= 100000
+#define CheckValidResultRelCompat(rri, cmd) \
+               CheckValidResultRel((rri), (cmd))
+#elif PG_VERSION_NUM >= 90500
+#define CheckValidResultRelCompat(rri, cmd) \
+               CheckValidResultRel((rri)->ri_RelationDesc, (cmd))
+#endif
 
 /*
  * BeginCopyFrom()
@@ -590,7 +600,6 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
 #endif
 
 
-
 /*
  * -------------
  *  Common code

src/partition_filter.c

@@ -268,7 +268,6 @@ scan_result_parts_storage(Oid partid, ResultPartsStorage *parts_storage)
 
 		/* Open relation and check if it is a valid target */
 		child_rel = heap_open(partid, NoLock);
-		CheckValidResultRel(child_rel, parts_storage->command_type);
 
 		/* Build Var translation list for 'inserted_cols' */
 		make_inh_translation_list(parent_rel, child_rel, 0, &translated_vars);
@@ -318,6 +317,9 @@ scan_result_parts_storage(Oid partid, ResultPartsStorage *parts_storage)
 		/* ri_ConstraintExprs will be initialized by ExecRelCheck() */
 		child_result_rel_info->ri_ConstraintExprs = NULL;
 
+		/* Check that this partition is a valid result relation */
+		CheckValidResultRelCompat(child_result_rel_info, parts_storage->command_type);
+
 		/* Fill the ResultRelInfo holder */
 		rri_holder->partid = partid;
 		rri_holder->result_rel_info = child_result_rel_info;