Fix declarative syntax for pg10

ildus · ildus · commit 740239fa40ad · 2018-10-04T19:06:52.000+03:00
diff --git a/Makefile b/Makefile
@@ -2,13 +2,10 @@
 
 MODULE_big = pg_pathman
 
-# versions of postgresql with declarative partitioning
-DECL_CHECK_VERSIONS = 10 11
-
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 VNUM := $(shell $(PG_CONFIG) --version | awk '{print $$2}')
-ifeq ($(VNUM),$(filter $(VNUM), $(DECL_CHECK_VERSIONS)))
+ifeq ($(VNUM),$(filter 10% 11%,$(VNUM)))
 	EXTRA_REGRESS = pathman_declarative
 	EXTRA_OBJS = src/declarative.o
 endif
@@ -21,7 +18,7 @@ OBJS = src/init.o src/relation_info.o src/utils.o src/partition_filter.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 $(WIN32RES)
+	src/partition_overseer.o $(EXTRA_OBJS) $(WIN32RES)
 
 ifdef USE_PGXS
 override PG_CPPFLAGS += -I$(CURDIR)/src/include
@@ -73,7 +70,8 @@ REGRESS = pathman_array_qual \
 		  pathman_update_triggers \
 		  pathman_upd_del \
 		  pathman_utility_stmt \
-		  pathman_views ${EXTRA_REGRESS}
+		  pathman_views $(EXTRA_REGRESS)
+
 
 EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
 
diff --git a/expected/pathman_declarative.out b/expected/pathman_declarative.out
@@ -58,7 +58,6 @@ Check constraints:
 Inherits: test.range_rel
 
 ALTER TABLE test.range_rel DETACH PARTITION test.r2;
-NOTICE:  trigger "range_rel_upd_trig" for relation "test.r2" does not exist, skipping
 SELECT * FROM pathman.pathman_partition_list;
      parent     |    partition     | parttype | expr | range_min  | range_max  
 ----------------+------------------+----------+------+------------+------------
diff --git a/src/declarative.c b/src/declarative.c
@@ -1,19 +1,22 @@
+#include "pathman.h"
 #include "declarative.h"
 #include "utils.h"
 #include "partition_creation.h"
 
-#include "fmgr.h"
 #include "access/htup_details.h"
 #include "catalog/namespace.h"
-#include "catalog/pg_type.h"
 #include "catalog/pg_proc.h"
+#include "catalog/pg_type.h"
+#include "fmgr.h"
+#include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
-#include "parser/parse_func.h"
+#include "optimizer/planner.h"
 #include "parser/parse_coerce.h"
-#include "utils/int8.h"
-#include "utils/lsyscache.h"
+#include "parser/parse_func.h"
 #include "utils/builtins.h"
 #include "utils/int8.h"
+#include "utils/int8.h"
+#include "utils/lsyscache.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 #include "utils/varbit.h"
@@ -33,13 +36,16 @@ modify_declative_partitioning_query(Query *query)
 
 	if (IsA(query->utilityStmt, AlterTableStmt))
 	{
+		PartRelationInfo	*prel;
 		ListCell   *lcmd;
 		Oid			relid;
 
 		AlterTableStmt *stmt = (AlterTableStmt *) query->utilityStmt;
 		relid = RangeVarGetRelid(stmt->relation, NoLock, true);
-		if (get_pathman_relation_info(relid) != NULL)
+		if ((prel = get_pathman_relation_info(relid)) != NULL)
 		{
+			close_pathman_relation_info(prel);
+
 			foreach(lcmd, stmt->cmds)
 			{
 				AlterTableCmd *cmd = (AlterTableCmd *) lfirst(lcmd);
@@ -61,16 +67,20 @@ modify_declative_partitioning_query(Query *query)
 bool
 is_pathman_related_partitioning_cmd(Node *parsetree, Oid *parent_relid)
 {
+	PartRelationInfo	*prel;
+
 	if (IsA(parsetree, AlterTableStmt))
 	{
 		ListCell	   *lc;
 		AlterTableStmt *stmt = (AlterTableStmt *) parsetree;
 		int				cnt = 0;
 
 		*parent_relid = RangeVarGetRelid(stmt->relation, NoLock, false);
-		if (get_pathman_relation_info(*parent_relid) == NULL)
+		if ((prel = get_pathman_relation_info(*parent_relid)) == NULL)
 			return false;
 
+		close_pathman_relation_info(prel);
+
 		/*
 		 * Since cmds can contain multiple commmands but we can handle only
 		 * two of them here, so we need to check that there are only commands
@@ -106,9 +116,10 @@ is_pathman_related_partitioning_cmd(Node *parsetree, Oid *parent_relid)
 		{
 			RangeVar *rv = castNode(RangeVar, linitial(stmt->inhRelations));
 			*parent_relid = RangeVarGetRelid(rv, NoLock, false);
-			if (get_pathman_relation_info(*parent_relid) == NULL)
+			if ((prel = get_pathman_relation_info(*parent_relid)) == NULL)
 				return false;
 
+			close_pathman_relation_info(prel);
 			if (stmt->tableElts != NIL)
 				elog(ERROR, "pg_pathman doesn't support column definitions "
 						"in declarative syntax yet");
@@ -202,7 +213,7 @@ handle_attach_partition(Oid parent_relid, AlterTableCmd *cmd)
 	A_Const				   *con;
 	List				   *fn_args;
 	ParseState			   *pstate = make_parsestate(NULL);
-	const PartRelationInfo *prel;
+	PartRelationInfo	   *prel;
 
 	PartitionCmd		*pcmd	= (PartitionCmd *) cmd->def;
 
@@ -238,6 +249,7 @@ handle_attach_partition(Oid parent_relid, AlterTableCmd *cmd)
 	rdatum = (PartitionRangeDatum *) linitial(bound->upperdatums);
 	con = castNode(A_Const, rdatum->value);
 	rval = transform_bound_value(pstate, con, prel->ev_type, prel->ev_typmod);
+	close_pathman_relation_info(prel);
 
 	/* Lookup function's Oid and get FmgrInfo */
 	fmgr_info(LookupFuncName(proc_name, 4, proc_args, false), &proc_flinfo);
@@ -255,9 +267,9 @@ handle_attach_partition(Oid parent_relid, AlterTableCmd *cmd)
 		(Node *) make_fn_expr(proc_fcinfo.flinfo->fn_oid, fn_args);
 
 	proc_fcinfo.arg[2] = lval->constvalue;
-	proc_fcinfo.argnull[2] = ldatum->infinite || lval->constisnull;
+	proc_fcinfo.argnull[2] = lval->constisnull;
 	proc_fcinfo.arg[3] = rval->constvalue;
-	proc_fcinfo.argnull[3] = rdatum->infinite || rval->constisnull;
+	proc_fcinfo.argnull[3] = rval->constisnull;
 
 	/* Invoke the callback */
 	FunctionCallInvoke(&proc_fcinfo);
@@ -303,7 +315,7 @@ handle_create_partition_of(Oid parent_relid, CreateStmt *stmt)
 {
 	Bound					start,
 							end;
-	const PartRelationInfo *prel;
+	PartRelationInfo	   *prel;
 	ParseState			   *pstate = make_parsestate(NULL);
 	PartitionRangeDatum	   *ldatum,
 						   *rdatum;
@@ -339,6 +351,7 @@ handle_create_partition_of(Oid parent_relid, CreateStmt *stmt)
 	rdatum = (PartitionRangeDatum *) linitial(bound->upperdatums);
 	con = castNode(A_Const, rdatum->value);
 	rval = transform_bound_value(pstate, con, prel->ev_type, prel->ev_typmod);
+	close_pathman_relation_info(prel);
 
 	start = lval->constisnull?
 		MakeBoundInf(MINUS_INFINITY) :
