Merge branch 'PGPROEE10_PGPRO-1658' into PGPROEE10

Author: vbwagner

contrib/test_partition/expected/partition.out

@@ -321,3 +321,16 @@ SELECT count(*) FROM conc_pt;
 
 DROP TABLE conc_pt CASCADE;
 NOTICE:  drop cascades to 10 other objects
+/* Create table with non-scalar key */
+CREATE TABLE abc (id NUMERIC NOT NULL) PARTITION BY RANGE (id) USING pg_pathman;
+ALTER TABLE abc ADD PARTITION abc_0 VALUES LESS THAN (0);
+ALTER TABLE abc ADD PARTITION abc_100 VALUES LESS THAN (100);
+INSERT INTO abc SELECT generate_series(-99, 99);
+SELECT tableoid::regclass, * FROM abc WHERE id BETWEEN -1 AND 1;
+ tableoid | id 
+----------+----
+ abc_0    | -1
+ abc_100  |  0
+ abc_100  |  1
+(3 rows)
+

contrib/test_partition/sql/partition.sql

@@ -190,3 +190,10 @@ SELECT count(*) FROM ONLY conc_pt;
 SELECT count(*) FROM conc_pt;
 
 DROP TABLE conc_pt CASCADE;
+
+/* Create table with non-scalar key */
+CREATE TABLE abc (id NUMERIC NOT NULL) PARTITION BY RANGE (id) USING pg_pathman;
+ALTER TABLE abc ADD PARTITION abc_0 VALUES LESS THAN (0);
+ALTER TABLE abc ADD PARTITION abc_100 VALUES LESS THAN (100);
+INSERT INTO abc SELECT generate_series(-99, 99);
+SELECT tableoid::regclass, * FROM abc WHERE id BETWEEN -1 AND 1;

src/backend/commands/partition.c

@@ -220,6 +220,7 @@ create_range_partitions(PartitionSpec *partspec,
 	Oid				key_type;
 	int32			key_typmod;
 	Datum			start_value;
+	bool			start_value_isnull;
 
 	/* parameters */
 	Datum			interval_datum;
@@ -244,9 +245,13 @@ create_range_partitions(PartitionSpec *partspec,
 		if (!IsA(n, Const))
 			elog(ERROR, "Start value should be a constant expression");
 		start_value = ((Const *) n)->constvalue;
+		start_value_isnull = false;
 	}
 	else
+	{
 		start_value = (Datum) 0;
+		start_value_isnull = true;
+	}
 
 	context = deparse_context_for(get_rel_name(relid), relid);
 	expr_str = deparse_expression(expr, context, false, false);
@@ -256,6 +261,7 @@ create_range_partitions(PartitionSpec *partspec,
 							   expr_str,
 							   key_type,
 							   start_value,
+							   start_value_isnull,
 							   interval_datum,
 							   interval_type,
 							   partspec->interval == NULL,

src/backend/commands/pathman_wrapper.c

@@ -152,8 +152,8 @@ pathman_invoke_return_value_omit_errors(const char *func,
 static void
 InitFuncArgs(FuncArgs *funcargs, uint32 size)
 {
-	funcargs->types = palloc(sizeof(Oid) * size);
-	funcargs->values = palloc(sizeof(Datum) * size);
+	funcargs->types = palloc0(sizeof(Oid) * size);
+	funcargs->values = palloc0(sizeof(Datum) * size);
 	funcargs->nulls = palloc(sizeof(char) * size);
 	funcargs->nargs = size;
 
@@ -396,6 +396,7 @@ pm_create_range_partitions(Oid relid,
 						const char *attname,
 						Oid atttype,
 						Datum start_from,
+						bool start_value_isnull,
 						Datum interval,
 						Oid interval_type,
 						bool interval_isnull,
@@ -408,7 +409,10 @@ pm_create_range_partitions(Oid relid,
 	InitFuncArgs(&args, 6);
 	PG_SETARG_DATUM(&args, 0, OIDOID, relid);
 	PG_SETARG_DATUM(&args, 1, TEXTOID, PointerGetDatum(cstring_to_text(attname)));
-	PG_SETARG_DATUM(&args, 2, atttype, start_from);
+	if (!start_value_isnull)
+		PG_SETARG_DATUM(&args, 2, atttype, start_from);
+	else
+		PG_SETARG_NULL(&args, 2, atttype);
 
 	if (!interval_isnull)
 		PG_SETARG_DATUM(&args, 3, interval_type, interval);

src/include/commands/pathman_wrapper.h

@@ -29,6 +29,7 @@ void pm_create_range_partitions(Oid relid,
 						const char *attname,
 						Oid atttype,
 						Datum start_from,
+						bool start_value_isnull,
 						Datum interval,
 						Oid interval_type,
 						bool interval_isnull,