Define compatible version for RelationDefine routine

maksm90 · maksm90 · commit b19f72cf82cc · 2017-04-24T20:14:13.000+03:00
diff --git a/src/include/compat/pg_compat.h b/src/include/compat/pg_compat.h
@@ -68,6 +68,21 @@
 #endif
 
 
+/*
+ * DefineRelation()
+ *
+ * for v10 set NULL on 'queryString' parameter as it uses only under vanilla
+ * partition creating
+ */
+#if PG_VERSION_NUM >= 100000
+#define DefineRelationCompat(createstmt, relkind, ownerId, typaddress) \
+	DefineRelation((createstmt), (relkind), (ownerId), (typaddress), NULL)
+#elif PG_VERSION_NUM >= 90500
+#define DefineRelationCompat(createstmt, relkind, ownerId, typaddress) \
+	DefineRelation((createstmt), (relkind), (ownerId), (typaddress))
+#endif
+
+
 /*
  * CatalogIndexInsert()
  */
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -858,11 +858,8 @@ create_table_using_stmt(CreateStmt *create_stmt, Oid relowner)
 							 GUC_ACTION_SAVE, true, 0, false);
 
 	/* Create new partition owned by parent's posessor */
-#if PG_VERSION_NUM >= 100000
-	table_addr = DefineRelation(create_stmt, RELKIND_RELATION, relowner, NULL, NULL);
-#else
-	table_addr = DefineRelation(create_stmt, RELKIND_RELATION, relowner, NULL);
-#endif
+	table_addr = DefineRelationCompat(create_stmt, RELKIND_RELATION, relowner,
+									  NULL);
 
 	/* Save data about a simple DDL command that was just executed */
 	EventTriggerCollectSimpleCommand(table_addr,
