Merge branch 'rel_future_beta' of github.com:postgrespro/pg_pathman into rel_future_beta

funbringer · funbringer · commit 757e249c76aa · 2017-02-10T18:06:42.000+03:00
diff --git a/expected/pathman_interval.out b/expected/pathman_interval.out
@@ -20,6 +20,9 @@ ERROR:  cannot find appropriate partition for key '250'
 /* Set a trivial interval */
 SELECT set_interval('abc', 0);
 ERROR:  interval must not be trivial
+/* Set a negative interval */
+SELECT set_interval('abc', -100);
+ERROR:  interval must not be negative
 /* We also shouldn't be able to set a trivial interval directly in pathman_config table */
 UPDATE pathman_config SET range_interval = '0' WHERE partrel = 'abc'::REGCLASS;
 ERROR:  interval must not be trivial
diff --git a/sql/pathman_interval.sql b/sql/pathman_interval.sql
@@ -9,6 +9,8 @@ SELECT set_interval('abc', NULL::INTEGER);
 INSERT INTO abc VALUES (250);
 /* Set a trivial interval */
 SELECT set_interval('abc', 0);
+/* Set a negative interval */
+SELECT set_interval('abc', -100);
 /* We also shouldn't be able to set a trivial interval directly in pathman_config table */
 UPDATE pathman_config SET range_interval = '0' WHERE partrel = 'abc'::REGCLASS;
 /* Set a normal interval */
diff --git a/src/pl_range_funcs.c b/src/pl_range_funcs.c
@@ -684,6 +684,7 @@ interval_is_trivial(Oid atttype, Datum interval, Oid interval_type)
 	Operator	op;
 	Oid			op_func;
 	FmgrInfo	cmp_func;
+	int32		cmp_result;
 
 	/* Generate default value */
 	switch(atttype)
@@ -754,8 +755,13 @@ interval_is_trivial(Oid atttype, Datum interval, Oid interval_type)
 	fill_type_cmp_fmgr_info(&cmp_func,
 							getBaseType(atttype),
 							getBaseType(op_result_type));
-	if (DatumGetInt32(FunctionCall2(&cmp_func, default_value, op_result)) == 0)
+	cmp_result = DatumGetInt32(FunctionCall2(&cmp_func,
+											 default_value,
+											 op_result));
+	if (cmp_result == 0)
 		return true;
+	else if (cmp_result > 0)	/* Negative interval? */
+		elog(ERROR, "interval must not be negative");
 
 	return false;
 }
