Changes for PostgreSQL v15

kovdb75 · kovdb75 · commit 90e90e9912b9 · 2021-11-09T00:47:23.000+03:00
diff --git a/src/hooks.c b/src/hooks.c
@@ -293,7 +293,11 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 		 * Currently we use get_parameterized_joinrel_size() since
 		 * it works just fine, but this might change some day.
 		 */
+#if PG_VERSION_NUM >= 150000 /* reason: commit 18fea737b5e4 */
+		nest_path->jpath.path.rows =
+#else
 		nest_path->path.rows =
+#endif
 				get_parameterized_joinrel_size_compat(root, joinrel,
 													  outer, inner,
 													  extra->sjinfo,
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -92,8 +92,13 @@ static void postprocess_child_table_and_atts(Oid parent_relid, Oid partition_rel
 static Oid text_to_regprocedure(text *proname_args);
 
 static Constraint *make_constraint_common(char *name, Node *raw_expr);
-static Value make_string_value_struct(char *str);
+#if PG_VERSION_NUM >= 150000 /* reason: commit 639a86e36aae */
+static String make_string_value_struct(char *str);
+static Integer make_int_value_struct(int int_val);
+#else
+static Value make_string_value_struct(char* str);
 static Value make_int_value_struct(int int_val);
+#endif
 
 static Node *build_partitioning_expression(Oid parent_relid,
 										   Oid *expr_type,
@@ -1356,12 +1361,21 @@ build_raw_range_check_tree(Node *raw_expression,
 						   const Bound *end_value,
 						   Oid value_type)
 {
+#if PG_VERSION_NUM >= 150000 /* reason: commit 639a86e36aae */
+#define BuildConstExpr(node, value, value_type) \
+	do { \
+		(node)->val.sval = make_string_value_struct( \
+							datum_to_cstring((value), (value_type))); \
+		(node)->location = -1; \
+	} while (0)
+#else
 #define BuildConstExpr(node, value, value_type) \
 	do { \
 		(node)->val = make_string_value_struct( \
 							datum_to_cstring((value), (value_type))); \
 		(node)->location = -1; \
 	} while (0)
+#endif
 
 #define BuildCmpExpr(node, opname, expr, c) \
 	do { \
@@ -1554,11 +1568,19 @@ build_raw_hash_check_tree(Node *raw_expression,
 	hash_proc = tce->hash_proc;
 
 	/* Total amount of partitions */
+#if PG_VERSION_NUM >= 150000 /* reason: commit 639a86e36aae */
+	part_count_c->val.ival = make_int_value_struct(part_count);
+#else
 	part_count_c->val = make_int_value_struct(part_count);
+#endif
 	part_count_c->location = -1;
 
 	/* Index of this partition (hash % total amount) */
+#if PG_VERSION_NUM >= 150000 /* reason: commit 639a86e36aae */
+	part_idx_c->val.ival = make_int_value_struct(part_idx);
+#else
 	part_idx_c->val = make_int_value_struct(part_idx);
+#endif
 	part_idx_c->location = -1;
 
 	/* Call hash_proc() */
@@ -1649,6 +1671,29 @@ make_constraint_common(char *name, Node *raw_expr)
 	return constraint;
 }
 
+#if PG_VERSION_NUM >= 150000 /* reason: commit 639a86e36aae */
+static String
+make_string_value_struct(char* str)
+{
+	String val;
+
+	val.type = T_String;
+	val.val = str;
+
+	return val;
+}
+
+static Integer
+make_int_value_struct(int int_val)
+{
+	Integer val;
+
+	val.type = T_Integer;
+	val.val = int_val;
+
+	return val;
+}
+#else
 static Value
 make_string_value_struct(char *str)
 {
@@ -1670,7 +1715,7 @@ make_int_value_struct(int int_val)
 
 	return val;
 }
-
+#endif /* PG_VERSION_NUM >= 150000 */
 
 /*
  * ---------------------
