small refactorings in test suite

Author: funbringer

Makefile

@@ -46,6 +46,7 @@ REGRESS = pathman_array_qual \
 		  pathman_join_clause \
 		  pathman_lateral \
 		  pathman_mergejoin \
+		  pathman_multilevel \
 		  pathman_only \
 		  pathman_param_upd_del \
 		  pathman_permissions \

expected/pathman_basic.out

@@ -1851,18 +1851,6 @@ ORDER BY partition;
 
 DROP TABLE test.provided_part_names CASCADE;
 NOTICE:  drop cascades to 2 other objects
-/* Check that multilivel is prohibited */
-CREATE TABLE test.multi(key int NOT NULL);
-SELECT create_hash_partitions('test.multi', 'key', 3);
- create_hash_partitions 
-------------------------
-                      3
-(1 row)
-
-SELECT create_hash_partitions('test.multi_1', 'key', 3);
-ERROR:  multilevel partitioning is not supported
-DROP TABLE test.multi CASCADE;
-NOTICE:  drop cascades to 3 other objects
 DROP SCHEMA test CASCADE;
 NOTICE:  drop cascades to 28 other objects
 DROP EXTENSION pg_pathman CASCADE;

expected/pathman_multilevel.out

@@ -0,0 +1,44 @@
+\set VERBOSITY terse
+SET search_path = 'public';
+CREATE EXTENSION pg_pathman;
+CREATE SCHEMA multi;
+/* Check that multilevel is prohibited */
+CREATE TABLE multi.test(key int NOT NULL);
+SELECT create_hash_partitions('multi.test', 'key', 3);
+ create_hash_partitions 
+------------------------
+                      3
+(1 row)
+
+SELECT create_hash_partitions('multi.test_1', 'key', 3);
+ERROR:  multilevel partitioning is not supported
+DROP TABLE multi.test CASCADE;
+NOTICE:  drop cascades to 3 other objects
+/* Attach partitioned subtree to 'abc' */
+CREATE TABLE multi.abc (val int NOT NULL);
+CREATE TABLE multi.def (LIKE multi.abc);
+SELECT create_hash_partitions('multi.def', 'val', 2);
+ create_hash_partitions 
+------------------------
+                      2
+(1 row)
+
+ALTER TABLE multi.def INHERIT multi.abc;
+/*
+ * Although multilevel partitioning is not supported,
+ * we must make sure that pg_pathman won't add
+ * duplicate relations to the final plan.
+ */
+EXPLAIN (COSTS OFF) TABLE multi.abc;
+       QUERY PLAN        
+-------------------------
+ Append
+   ->  Seq Scan on abc
+   ->  Seq Scan on def
+   ->  Seq Scan on def_0
+   ->  Seq Scan on def_1
+(5 rows)
+
+DROP SCHEMA multi CASCADE;
+NOTICE:  drop cascades to 4 other objects
+DROP EXTENSION pg_pathman;

sql/pathman_basic.sql

@@ -551,12 +551,6 @@ ORDER BY partition;
 
 DROP TABLE test.provided_part_names CASCADE;
 
-/* Check that multilivel is prohibited */
-CREATE TABLE test.multi(key int NOT NULL);
-SELECT create_hash_partitions('test.multi', 'key', 3);
-SELECT create_hash_partitions('test.multi_1', 'key', 3);
-DROP TABLE test.multi CASCADE;
-
 
 DROP SCHEMA test CASCADE;
 DROP EXTENSION pg_pathman CASCADE;

sql/pathman_multilevel.sql

@@ -0,0 +1,30 @@
+\set VERBOSITY terse
+
+SET search_path = 'public';
+CREATE EXTENSION pg_pathman;
+CREATE SCHEMA multi;
+
+
+/* Check that multilevel is prohibited */
+CREATE TABLE multi.test(key int NOT NULL);
+SELECT create_hash_partitions('multi.test', 'key', 3);
+SELECT create_hash_partitions('multi.test_1', 'key', 3);
+DROP TABLE multi.test CASCADE;
+
+
+/* Attach partitioned subtree to 'abc' */
+CREATE TABLE multi.abc (val int NOT NULL);
+CREATE TABLE multi.def (LIKE multi.abc);
+SELECT create_hash_partitions('multi.def', 'val', 2);
+ALTER TABLE multi.def INHERIT multi.abc;
+
+/*
+ * Although multilevel partitioning is not supported,
+ * we must make sure that pg_pathman won't add
+ * duplicate relations to the final plan.
+ */
+EXPLAIN (COSTS OFF) TABLE multi.abc;
+
+
+DROP SCHEMA multi CASCADE;
+DROP EXTENSION pg_pathman;