Fix build errors and tests with our standard and enterprise versions

ildus · ildus · commit 085f2362d3f3 · 2018-10-09T15:32:23.000+03:00
diff --git a/Makefile b/Makefile
@@ -2,23 +2,13 @@
 
 MODULE_big = pg_pathman
 
-ifdef USE_PGXS
-PG_CONFIG = pg_config
-VNUM := $(shell $(PG_CONFIG) --version | awk '{print $$2}')
-ifeq ($(VNUM),$(filter 10% 11%,$(VNUM)))
-	EXTRA_REGRESS = pathman_declarative
-	EXTRA_OBJS = src/declarative.o
-endif
-endif
-include $(PGXS)
-
 OBJS = src/init.o src/relation_info.o src/utils.o src/partition_filter.o \
 	src/runtime_append.o src/runtime_merge_append.o src/pg_pathman.o src/rangeset.o \
 	src/pl_funcs.o src/pl_range_funcs.o src/pl_hash_funcs.o src/pathman_workers.o \
 	src/hooks.o src/nodes_common.o src/xact_handling.o src/utility_stmt_hooking.o \
 	src/planner_tree_modification.o src/debug_print.o src/partition_creation.o \
 	src/compat/pg_compat.o src/compat/rowmarks_fix.o src/partition_router.o \
-	src/partition_overseer.o $(EXTRA_OBJS) $(WIN32RES)
+	src/partition_overseer.o $(WIN32RES)
 
 ifdef USE_PGXS
 override PG_CPPFLAGS += -I$(CURDIR)/src/include
@@ -70,24 +60,45 @@ REGRESS = pathman_array_qual \
 		  pathman_update_triggers \
 		  pathman_upd_del \
 		  pathman_utility_stmt \
-		  pathman_views $(EXTRA_REGRESS)
+		  pathman_views
 
 
 EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
 
 EXTRA_CLEAN = pg_pathman--$(EXTVERSION).sql ./isolation_output
 
 ifdef USE_PGXS
-PG_CONFIG = pg_config
+PG_CONFIG=pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
-include $(PGXS)
+VNUM := $(shell $(PG_CONFIG) --version | awk '{print $$2}')
 else
 subdir = contrib/pg_pathman
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
+endif
+
+# our standard version could also use declarative syntax
+ifdef PGPRO_EDITION
+ifeq ($(PGPRO_EDITION),standard)
+VNUM := $(VERSION)
+endif
+endif
+
+ifdef VNUM
+ifeq ($(VNUM),$(filter 10% 11%,$(VNUM)))
+REGRESS += pathman_declarative
+OBJS += src/declarative.o
+override PG_CPPFLAGS += -DENABLE_DECLARATIVE
+endif
+endif
+
+ifdef USE_PGXS
+include $(PGXS)
+else
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
+
 $(EXTENSION)--$(EXTVERSION).sql: init.sql hash.sql range.sql
 	cat $^ > $@
 
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ The `pg_pathman` module provides optimized partitioning mechanism and functions
 The extension is compatible with:
 
  * PostgreSQL 9.5, 9.6, 10, 11;
- * Postgres Pro Standard 9.5, 9.6;
+ * Postgres Pro Standard 9.5, 9.6, 10;
  * Postgres Pro Enterprise;
 
 Take a look at our Wiki [out there](https://github.com/postgrespro/pg_pathman/wiki).
diff --git a/sql/pathman_hashjoin.sql b/sql/pathman_hashjoin.sql
@@ -33,6 +33,7 @@ SET enable_seqscan = OFF;
 SET enable_nestloop = OFF;
 SET enable_hashjoin = ON;
 SET enable_mergejoin = OFF;
+
 EXPLAIN (COSTS OFF)
 SELECT * FROM test.range_rel j1
 JOIN test.range_rel j2 on j2.id = j1.id
diff --git a/sql/pathman_mergejoin.sql b/sql/pathman_mergejoin.sql
@@ -44,7 +44,6 @@ WHERE j1.dt < '2015-03-01' AND j2.dt >= '2015-02-01' ORDER BY j2.dt;
 SET enable_hashjoin = ON;
 SET enable_nestloop = ON;
 
-
 DROP SCHEMA test CASCADE;
 DROP EXTENSION pg_pathman;
 DROP SCHEMA pathman CASCADE;
diff --git a/src/declarative.c b/src/declarative.c
@@ -29,7 +29,7 @@
  * we set it back (look `is_pathman_related_partitioning_cmd`)
  */
 void
-modify_declative_partitioning_query(Query *query)
+modify_declarative_partitioning_query(Query *query)
 {
 	if (query->commandType != CMD_UTILITY)
 		return;
diff --git a/src/hooks.c b/src/hooks.c
@@ -962,7 +962,7 @@ pathman_process_utility_hook(Node *first_arg,
 								get_attname_compat(relation_oid, attr_number),
 								get_rel_name(relation_oid))));
 		}
-#if PG_VERSION_NUM >= 100000
+#ifdef ENABLE_DECLARATIVE
 		else if (is_pathman_related_partitioning_cmd(parsetree, &relation_oid))
 		{
 			/* we can handle all the partitioning commands in ALTER .. TABLE */
diff --git a/src/include/declarative.h b/src/include/declarative.h
@@ -5,7 +5,7 @@
 #include "nodes/nodes.h"
 #include "nodes/parsenodes.h"
 
-void modify_declative_partitioning_query(Query *query);
+void modify_declarative_partitioning_query(Query *query);
 bool is_pathman_related_partitioning_cmd(Node *parsetree, Oid *parent_relid);
 
 /* actual actions */
diff --git a/src/planner_tree_modification.c b/src/planner_tree_modification.c
@@ -429,8 +429,8 @@ pathman_post_analyze_query_walker(Node *node, void *context)
 		Query *query = (Query *) node;
 
 		/* Make changes for declarative syntax */
-#if PG_VERSION_NUM >= 100000
-		modify_declative_partitioning_query(query);
+#ifdef ENABLE_DECLARATIVE
+		modify_declarative_partitioning_query(query);
 #endif
 
 		/* Handle Query node */

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	* we set it back (look `is_pathman_related_partitioning_cmd`)
`30`	`30`	`*/`
`31`	`31`	`void`
`32`		`-modify_declative_partitioning_query(Query *query)`
	`32`	`+modify_declarative_partitioning_query(Query *query)`
`33`	`33`	`{`
`34`	`34`	`if (query->commandType != CMD_UTILITY)`
`35`	`35`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -962,7 +962,7 @@ pathman_process_utility_hook(Node *first_arg,`
`962`	`962`	`get_attname_compat(relation_oid, attr_number),`
`963`	`963`	`get_rel_name(relation_oid))));`
`964`	`964`	`}`
`965`		`-#if PG_VERSION_NUM >= 100000`
	`965`	`+#ifdef ENABLE_DECLARATIVE`
`966`	`966`	`else if (is_pathman_related_partitioning_cmd(parsetree, &relation_oid))`
`967`	`967`	`{`
`968`	`968`	`/* we can handle all the partitioning commands in ALTER .. TABLE */`