Make compatible version of ProcessUtility routine

maksm90 · maksm90 · commit d1557d21b60f · 2017-04-26T18:43:06.000+03:00
diff --git a/src/include/compat/pg_compat.h b/src/include/compat/pg_compat.h
@@ -216,6 +216,32 @@ void McxtStatsInternal(MemoryContext context, int level,
 #endif
 
 
+/*
+ * ProcessUtility
+ *
+ * for v10 set NULL into 'queryEnv' argument
+ */
+#if PG_VERSION_NUM >= 100000
+#define ProcessUtilityCompat(parsetree, queryString, context, params, dest, \
+							 completionTag) \
+		do { \
+			PlannedStmt *stmt = makeNode(PlannedStmt); \
+			stmt->commandType = CMD_UTILITY; \
+			stmt->canSetTag = true; \
+			stmt->utilityStmt = (parsetree); \
+			stmt->stmt_location = -1; \
+			stmt->stmt_len = 0; \
+			ProcessUtility(stmt, (queryString), (context), (params), NULL, \
+						   (dest), (completionTag)); \
+		} while (0)
+#elif PG_VERSION_NUM >= 90500
+#define ProcessUtilityCompat(parsetree, queryString, context, params, dest, \
+							 completionTag) \
+		ProcessUtility((parsetree), (queryString), (context), (params), \
+					   (dest), (completionTag))
+#endif
+
+
 /*
  * pull_var_clause()
  */
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -786,22 +786,12 @@ create_single_partition_internal(Oid parent_relid,
 			 * call will stash the objects so created into our
 			 * event trigger context.
 			 */
-#if PG_VERSION_NUM >= 100000
-			ProcessUtility(NULL,
-						   "we have to provide a query string",
-						   PROCESS_UTILITY_SUBCOMMAND,
-						   NULL,
-						   NULL,
-						   None_Receiver,
-						   NULL);
-#else
-			ProcessUtility(cur_stmt,
-						   "we have to provide a query string",
-						   PROCESS_UTILITY_SUBCOMMAND,
-						   NULL,
-						   None_Receiver,
-						   NULL);
-#endif
+			ProcessUtilityCompat(cur_stmt,
+								 "we have to provide a query string",
+								 PROCESS_UTILITY_SUBCOMMAND,
+								 NULL,
+								 None_Receiver,
+								 NULL);
 		}
 
 		/* Update config one more time */
