fix compatibility issues for postgres 10

Author: zilder

src/partition_creation.c

@@ -47,6 +47,9 @@
 #include "utils/syscache.h"
 #include "utils/typcache.h"
 
+#if PG_VERSION_NUM >= 100000
+#include "utils/regproc.h"
+#endif
 
 static Oid spawn_partitions_val(Oid parent_relid,
 								const Bound *range_bound_min,
@@ -1955,18 +1958,29 @@ drop_single_update_trigger_internal(Oid relid,
 	 * To avoid warning message about missing trigger we check it beforehand.
 	 * and quit if it doesn't
 	 */
+#if PG_VERSION_NUM >= 100000
+	address = get_object_address(OBJECT_TRIGGER,
+								 (Node *) namelist,
+								 &relation,
+								 AccessExclusiveLock,
+								 true);
+#else
 	address = get_object_address(OBJECT_TRIGGER,
 								 namelist, NIL,
 								 &relation,
 								 AccessExclusiveLock,
 								 true);
+#endif
+
 	if (!OidIsValid(address.objectId))
 		return;
 
 	/* Actually remove trigger */
 	n->removeType	= OBJECT_TRIGGER;
 	n->objects		= list_make1(namelist);
+#if PG_VERSION_NUM < 100000
 	n->arguments	= NIL;
+#endif
 	n->behavior		= DROP_RESTRICT;  /* default behavior */
 	n->missing_ok	= true;
 	n->concurrent	= false;		

src/partition_filter.c

@@ -436,6 +436,7 @@ select_partition_for_insert(ExprContext *econtext, ExprState *expr_state,
 	int						nparts;
 	bool					isnull;
 	Datum					value;
+	Oid						parent = PrelParentRelid(prel);
 
 	/* Execute expression */
 	value = ExecEvalExprCompat(expr_state, econtext, &isnull,
@@ -453,11 +454,11 @@ select_partition_for_insert(ExprContext *econtext, ExprState *expr_state,
 			elog(ERROR, ERR_PART_ATTR_MULTIPLE);
 		else if (nparts == 0)
 		{
-			 selected_partid = create_partitions_for_value(PrelParentRelid(prel),
+			 selected_partid = create_partitions_for_value(parent,
 														   value, prel->ev_type);
 
 			 /* get_pathman_relation_info() will refresh this entry */
-			 invalidate_pathman_relation_info(PrelParentRelid(prel), NULL);
+			 invalidate_pathman_relation_info(parent, NULL);
 		}
 		else selected_partid = parts[0];
 
@@ -469,15 +470,15 @@ select_partition_for_insert(ExprContext *econtext, ExprState *expr_state,
 		if (rri_holder == NULL)
 		{
 			/* get_pathman_relation_info() will refresh this entry */
-			invalidate_pathman_relation_info(PrelParentRelid(prel), NULL);
+			invalidate_pathman_relation_info(parent, NULL);
 
 			/* Get a fresh PartRelationInfo */
-			prel = get_pathman_relation_info(PrelParentRelid(prel));
+			prel = get_pathman_relation_info(parent);
 
 			/* Paranoid check (all partitions have vanished) */
 			if (!prel)
 				elog(ERROR, "table \"%s\" is not partitioned",
-					 get_rel_name_or_relid(PrelParentRelid(prel)));
+					 get_rel_name_or_relid(parent));
 		}
 		/* If partition has subpartitions */
 		else if (rri_holder->has_subpartitions)

src/pl_funcs.c

@@ -671,8 +671,10 @@ is_tuple_convertible(PG_FUNCTION_ARGS)
 		map = convert_tuples_by_name(RelationGetDescr(rel1),
 									 RelationGetDescr(rel2),
 									 ERR_PART_DESC_CONVERT);
-		/* Now free map */
-		pfree(map);
+
+		/* Now free map. Note that map can be NULL if conversion isn't needed */
+		if (map)
+			pfree(map);
 	}
 	PG_CATCH();
 	{