Return null check if there is only column in expression

ildus · ildus · commit 74778cee444f · 2017-04-04T12:50:37.000+03:00
diff --git a/sql/pathman_basic.sql b/sql/pathman_basic.sql
@@ -11,7 +11,7 @@ CREATE TABLE test.hash_rel (
 INSERT INTO test.hash_rel VALUES (1, 1);
 INSERT INTO test.hash_rel VALUES (2, 2);
 INSERT INTO test.hash_rel VALUES (3, 3);
-SELECT pathman.create_hash_partitions('test.hash_rel', 'value + 1', 3);
+SELECT pathman.create_hash_partitions('test.hash_rel', 'value', 3);
 ALTER TABLE test.hash_rel ALTER COLUMN value SET NOT NULL;
 SELECT pathman.create_hash_partitions('test.hash_rel', 'value', 3, partition_data:=false);
 EXPLAIN (COSTS OFF) SELECT * FROM test.hash_rel;
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -1766,6 +1766,34 @@ get_part_expression_info(Oid relid, const char *expr_string,
 	/* Keep raw expression */
 	expr_info->raw_expr = get_raw_expression(relid, expr_string,
 			&query_string, &parsetree);
+
+	/* If expression is just column we check that is not null */
+	if (IsA(expr_info->raw_expr, ColumnRef))
+	{
+		ColumnRef *col = (ColumnRef *) expr_info->raw_expr;
+		if (list_length(col->fields) == 1)
+		{
+			HeapTuple	 tp;
+			bool		 result;
+			char		*attname	= strVal(linitial(col->fields));
+
+			/* check if attribute is nullable */
+			tp = SearchSysCacheAttName(relid, attname);
+			if (HeapTupleIsValid(tp))
+			{
+				Form_pg_attribute att_tup = (Form_pg_attribute) GETSTRUCT(tp);
+				result = !att_tup->attnotnull;
+				ReleaseSysCache(tp);
+			}
+			else
+				elog(ERROR, "Cannot find type name for attribute \"%s\" "
+							"of relation \"%s\"",
+					 attname, get_rel_name_or_relid(relid));
+
+			if (result)
+				elog(ERROR, "partitioning key \"%s\" must be NOT NULL", attname);
+		}
+	}
 	expr_info->expr_datum = (Datum) 0;
 
 	/* We don't need pathman activity initialization for this relation yet */
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -57,8 +57,6 @@ PG_FUNCTION_INFO_V1( build_check_constraint_name_attname );
 
 PG_FUNCTION_INFO_V1( validate_relname );
 PG_FUNCTION_INFO_V1( is_date_type );
-PG_FUNCTION_INFO_V1( is_attribute_nullable );
-//PG_FUNCTION_INFO_V1( is_expression_suitable );
 
 PG_FUNCTION_INFO_V1( add_to_pathman_config );
 PG_FUNCTION_INFO_V1( pathman_config_params_trigger_func );
@@ -602,6 +600,7 @@ is_date_type(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(is_date_type_internal(PG_GETARG_OID(0)));
 }
 
+
 /*
  * ------------------------
  *  Useful string builders
