drop_range_partition(): check that it's indeed a RANGE partition, allow unprivileged user to change GUC variable pg_pathman_enable_partition_filter

funbringer · funbringer · commit 593f47aade61 · 2016-10-06T03:16:46.000+03:00
diff --git a/README.md b/README.md
@@ -533,7 +533,7 @@ SELECT detach_range_partition('journal_archive');
 ```
 
 Here's an example of the query performing filtering by partitioning key:
-```
+```plpgsql
 SELECT * FROM journal WHERE dt >= '2015-06-01' AND dt < '2015-06-03';
    id   |         dt          | level |               msg
 --------+---------------------+-------+----------------------------------
diff --git a/range.sql b/range.sql
@@ -582,7 +582,7 @@ BEGIN
 
 	/* Check if this is a RANGE partition */
 	IF v_part_type != 2 THEN
-		RAISE EXCEPTION 'specified partition isn''t RANGE partition';
+		RAISE EXCEPTION '"%" is not a RANGE partition', p_partition::TEXT;
 	END IF;
 
 	v_atttype = @extschema@.get_attribute_type(v_parent, v_attname);
@@ -1036,11 +1036,22 @@ DECLARE
 	part_name		TEXT;
 	v_relkind		CHAR;
 	v_rows			BIGINT;
+	v_part_type		INTEGER;
 
 BEGIN
 	parent_relid := @extschema@.get_parent_of_partition(p_partition);
 	part_name := p_partition::TEXT; /* save the name to be returned */
 
+	SELECT parttype
+	FROM @extschema@.pathman_config
+	WHERE partrel = parent_relid
+	INTO v_part_type;
+
+	/* Check if this is a RANGE partition */
+	IF v_part_type != 2 THEN
+		RAISE EXCEPTION '"%" is not a RANGE partition', p_partition::TEXT;
+	END IF;
+
 	/* Acquire lock on parent */
 	PERFORM @extschema@.lock_partitioned_relation(parent_relid);
 
diff --git a/src/partition_filter.c b/src/partition_filter.c
@@ -92,7 +92,7 @@ init_partition_filter_static_data(void)
 							 NULL,
 							 &pg_pathman_enable_partition_filter,
 							 true,
-							 PGC_SUSET,
+							 PGC_USERSET,
 							 0,
 							 NULL,
 							 NULL,
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -173,7 +173,7 @@ get_parent_of_partition_pl(PG_FUNCTION_ARGS)
 		PG_RETURN_OID(parent);
 	else
 	{
-		elog(ERROR, "\%s\" is not pg_pathman's partition",
+		elog(ERROR, "\"%s\" is not a partition",
 			 get_rel_name_or_relid(partition));
 
 		PG_RETURN_NULL();

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ get_parent_of_partition_pl(PG_FUNCTION_ARGS)`
`173`	`173`	`PG_RETURN_OID(parent);`
`174`	`174`	`else`
`175`	`175`	`{`
`176`		`- elog(ERROR, "\%s\" is not pg_pathman's partition",`
	`176`	`+ elog(ERROR, "\"%s\" is not a partition",`
`177`	`177`	`get_rel_name_or_relid(partition));`
`178`	`178`
`179`	`179`	`PG_RETURN_NULL();`