improve functions get_part_range_by_idx() and get_part_range_by_oid(), tests

Author: funbringer

expected/pathman_calamity.out

@@ -617,6 +617,56 @@ SELECT count(*) FROM pathman_config_params WHERE partrel = 'calamity.to_be_disab
      0
 (1 row)
 
+/* check function get_part_range_by_idx() */
+CREATE TABLE calamity.test_range_idx(val INT4 NOT NULL);
+SELECT create_range_partitions('calamity.test_range_idx', 'val', 1, 10, 1);
+NOTICE:  sequence "test_range_idx_seq" does not exist, skipping
+ create_range_partitions 
+-------------------------
+                       1
+(1 row)
+
+SELECT get_part_range(NULL, 1, NULL::INT4);							/* not ok */
+ERROR:  'parent_relid' should not be NULL
+SELECT get_part_range('calamity.test_range_idx', NULL, NULL::INT4);	/* not ok */
+ERROR:  'partition_idx' should not be NULL
+SELECT get_part_range('calamity.test_range_idx', 0, NULL::INT2);	/* not ok */
+ERROR:  pg_typeof(dummy) should be integer
+SELECT get_part_range('calamity.test_range_idx', -2, NULL::INT4);	/* not ok */
+ERROR:  negative indices other than -1 (last partition) are not allowed
+SELECT get_part_range('calamity.test_range_idx', 4, NULL::INT4);	/* not ok */
+ERROR:  partition #4 does not exist (total amount is 1)
+SELECT get_part_range('calamity.test_range_idx', 0, NULL::INT4);	/* OK */
+ get_part_range 
+----------------
+ {1,11}
+(1 row)
+
+DROP TABLE calamity.test_range_idx CASCADE;
+NOTICE:  drop cascades to table calamity.test_range_idx_1
+/* check function get_part_range_by_oid() */
+CREATE TABLE calamity.test_range_oid(val INT4 NOT NULL);
+SELECT create_range_partitions('calamity.test_range_oid', 'val', 1, 10, 1);
+NOTICE:  sequence "test_range_oid_seq" does not exist, skipping
+ create_range_partitions 
+-------------------------
+                       1
+(1 row)
+
+SELECT get_part_range(NULL, NULL::INT4);							/* not ok */
+ERROR:  'partition_relid' should not be NULL
+SELECT get_part_range('pg_class', NULL::INT4);						/* not ok */
+ERROR:  relation "pg_class" is not a partition
+SELECT get_part_range('calamity.test_range_oid_1', NULL::INT2);		/* not ok */
+ERROR:  pg_typeof(dummy) should be integer
+SELECT get_part_range('calamity.test_range_oid_1', NULL::INT4);		/* OK */
+ get_part_range 
+----------------
+ {1,11}
+(1 row)
+
+DROP TABLE calamity.test_range_oid CASCADE;
+NOTICE:  drop cascades to table calamity.test_range_oid_1
 DROP SCHEMA calamity CASCADE;
-NOTICE:  drop cascades to 16 other objects
+NOTICE:  drop cascades to 18 other objects
 DROP EXTENSION pg_pathman;

sql/pathman_calamity.sql

@@ -235,5 +235,32 @@ SELECT count(*) FROM pathman_config WHERE partrel = 'calamity.to_be_disabled'::R
 SELECT count(*) FROM pathman_config_params WHERE partrel = 'calamity.to_be_disabled'::REGCLASS;
 
 
+/* check function get_part_range_by_idx() */
+CREATE TABLE calamity.test_range_idx(val INT4 NOT NULL);
+SELECT create_range_partitions('calamity.test_range_idx', 'val', 1, 10, 1);
+
+SELECT get_part_range(NULL, 1, NULL::INT4);							/* not ok */
+SELECT get_part_range('calamity.test_range_idx', NULL, NULL::INT4);	/* not ok */
+SELECT get_part_range('calamity.test_range_idx', 0, NULL::INT2);	/* not ok */
+SELECT get_part_range('calamity.test_range_idx', -2, NULL::INT4);	/* not ok */
+SELECT get_part_range('calamity.test_range_idx', 4, NULL::INT4);	/* not ok */
+SELECT get_part_range('calamity.test_range_idx', 0, NULL::INT4);	/* OK */
+
+DROP TABLE calamity.test_range_idx CASCADE;
+
+
+/* check function get_part_range_by_oid() */
+CREATE TABLE calamity.test_range_oid(val INT4 NOT NULL);
+SELECT create_range_partitions('calamity.test_range_oid', 'val', 1, 10, 1);
+
+SELECT get_part_range(NULL, NULL::INT4);							/* not ok */
+SELECT get_part_range('pg_class', NULL::INT4);						/* not ok */
+SELECT get_part_range('calamity.test_range_oid_1', NULL::INT2);		/* not ok */
+SELECT get_part_range('calamity.test_range_oid_1', NULL::INT4);		/* OK */
+
+DROP TABLE calamity.test_range_oid CASCADE;
+
+
+
 DROP SCHEMA calamity CASCADE;
 DROP EXTENSION pg_pathman;

src/pl_range_funcs.c

@@ -256,6 +256,12 @@ get_part_range_by_oid(PG_FUNCTION_ARGS)
 	prel = get_pathman_relation_info(parent_relid);
 	shout_if_prel_is_invalid(parent_relid, prel, PT_RANGE);
 
+	/* Check type of 'dummy' (for correct output) */
+	if (getBaseType(get_fn_expr_argtype(fcinfo->flinfo, 1)) != getBaseType(prel->atttype))
+		elog(ERROR, "pg_typeof(dummy) should be %s",
+			 format_type_be(getBaseType(prel->atttype)));
+
+
 	ranges = PrelGetRangesArray(prel);
 
 	/* Look for the specified partition */
@@ -309,6 +315,12 @@ get_part_range_by_idx(PG_FUNCTION_ARGS)
 	prel = get_pathman_relation_info(parent_relid);
 	shout_if_prel_is_invalid(parent_relid, prel, PT_RANGE);
 
+	/* Check type of 'dummy' (for correct output) */
+	if (getBaseType(get_fn_expr_argtype(fcinfo->flinfo, 2)) != getBaseType(prel->atttype))
+		elog(ERROR, "pg_typeof(dummy) should be %s",
+			 format_type_be(getBaseType(prel->atttype)));
+
+
 	/* Now we have to deal with 'idx' */
 	if (partition_idx < -1)
 	{