Make compat version of pg_analyze_and_rewrite

maksm90 · maksm90 · commit 4c62e4afb453 · 2017-05-16T16:53:09.000+03:00
diff --git a/src/include/compat/pg_compat.h b/src/include/compat/pg_compat.h
@@ -197,6 +197,14 @@ extern void create_plain_partial_paths(PlannerInfo *root,
 #endif
 
 
+/*
+ * get_rel_persistence()
+ */
+#if PG_VERSION_NUM >= 90500 && PG_VERSION_NUM < 90600
+char get_rel_persistence(Oid relid);
+#endif
+
+
 /*
  * InitResultRelInfo
  *
@@ -241,6 +249,24 @@ void McxtStatsInternal(MemoryContext context, int level,
 #endif
 
 
+/*
+ * pg_analyze_and_rewrite
+ *
+ * for v10 cast first arg to RawStmt type
+ */
+#if PG_VERSION_NUM >= 100000
+#define pg_analyze_and_rewrite_compat(parsetree, query_string, paramTypes, \
+									  numParams, queryEnv) \
+		pg_analyze_and_rewrite((RawStmt *) (parsetree), (query_string), \
+							   (paramTypes), (numParams), (queryEnv))
+#elif PG_VERSION_NUM >= 90500
+#define pg_analyze_and_rewrite_compat(parsetree, query_string, paramTypes, \
+									  numParams, queryEnv) \
+		pg_analyze_and_rewrite((Node *) (parsetree), (query_string), \
+							   (paramTypes), (numParams))
+#endif
+
+
 /*
  * ProcessUtility
  *
@@ -299,14 +325,6 @@ extern void set_rel_consider_parallel(PlannerInfo *root,
 #endif
 
 
-/*
- * get_rel_persistence()
- */
-#if PG_VERSION_NUM >= 90500 && PG_VERSION_NUM < 90600
-char get_rel_persistence(Oid relid);
-#endif
-
-
 /*
  * -------------
  *  Common code
diff --git a/src/relation_info.c b/src/relation_info.c
@@ -589,11 +589,7 @@ parse_partitioning_expression(const Oid relid,
 		*query_string_out = query_string;
 
 	if (parsetree_out)
-#if PG_VERSION_NUM >= 100000
 		*parsetree_out = (Node *) linitial(parsetree_list);
-#else
-		*parsetree_out = (Node *) select_stmt;
-#endif
 
 	return ((ResTarget *) linitial(select_stmt->targetList))->val;
 }
@@ -669,11 +665,9 @@ cook_partitioning_expression(const Oid relid,
 	old_mcxt = MemoryContextSwitchTo(parse_mcxt);
 
 	/* This will fail with elog in case of wrong expression */
-#if PG_VERSION_NUM >= 100000
-	querytree_list = pg_analyze_and_rewrite((RawStmt *) parsetree/* stub value */, query_string, NULL, 0, NULL);
-#else
-	querytree_list = pg_analyze_and_rewrite(parsetree, query_string, NULL, 0);
-#endif
+	querytree_list = pg_analyze_and_rewrite_compat(parsetree, query_string,
+												   NULL, 0, NULL);
+
 	if (list_length(querytree_list) != 1)
 		elog(ERROR, "partitioning expression produced more than 1 query");
 
