Merge branch 'rel_1_3_beta' into rel_future_beta

funbringer · funbringer · commit 84fa67fd0911 · 2017-02-07T17:47:43.000+03:00
diff --git a/expected/pathman_basic.out b/expected/pathman_basic.out
@@ -2392,7 +2392,45 @@ EXPLAIN (COSTS OFF) SELECT * FROM test.index_on_childs WHERE c1 > 100 AND c1 < 2
          Filter: (c1 < 2500)
 (12 rows)
 
+/* Test recursive CTE */
+CREATE TABLE test.recursive_cte_test_tbl(id INT NOT NULL, name TEXT NOT NULL);
+SELECT * FROM create_hash_partitions('test.recursive_cte_test_tbl', 'id', 2);
+ create_hash_partitions 
+------------------------
+                      2
+(1 row)
+
+INSERT INTO test.recursive_cte_test_tbl (id, name) SELECT id, 'name'||id FROM generate_series(1,100) f(id);
+INSERT INTO test.recursive_cte_test_tbl (id, name) SELECT id, 'name'||(id + 1) FROM generate_series(1,100) f(id);
+INSERT INTO test.recursive_cte_test_tbl (id, name) SELECT id, 'name'||(id + 2) FROM generate_series(1,100) f(id);
+SELECT * FROM test.recursive_cte_test_tbl WHERE id = 5;
+ id | name  
+----+-------
+  5 | name5
+  5 | name6
+  5 | name7
+(3 rows)
+
+WITH RECURSIVE test AS (
+	SELECT min(name) AS name
+	FROM test.recursive_cte_test_tbl
+	WHERE id = 5
+	UNION ALL
+	SELECT (SELECT min(name)
+			FROM test.recursive_cte_test_tbl
+			WHERE id = 5 AND name > test.name)
+	FROM test
+	WHERE name IS NOT NULL)
+SELECT * FROM test;
+ name  
+-------
+ name5
+ name6
+ name7
+ 
+(4 rows)
+
 DROP SCHEMA test CASCADE;
-NOTICE:  drop cascades to 51 other objects
+NOTICE:  drop cascades to 54 other objects
 DROP EXTENSION pg_pathman CASCADE;
 DROP SCHEMA pathman CASCADE;
diff --git a/sql/pathman_basic.sql b/sql/pathman_basic.sql
@@ -679,6 +679,27 @@ SELECT set_enable_parent('test.index_on_childs', true);
 VACUUM ANALYZE test.index_on_childs;
 EXPLAIN (COSTS OFF) SELECT * FROM test.index_on_childs WHERE c1 > 100 AND c1 < 2500 AND c2 = 500;
 
+/* Test recursive CTE */
+CREATE TABLE test.recursive_cte_test_tbl(id INT NOT NULL, name TEXT NOT NULL);
+SELECT * FROM create_hash_partitions('test.recursive_cte_test_tbl', 'id', 2);
+INSERT INTO test.recursive_cte_test_tbl (id, name) SELECT id, 'name'||id FROM generate_series(1,100) f(id);
+INSERT INTO test.recursive_cte_test_tbl (id, name) SELECT id, 'name'||(id + 1) FROM generate_series(1,100) f(id);
+INSERT INTO test.recursive_cte_test_tbl (id, name) SELECT id, 'name'||(id + 2) FROM generate_series(1,100) f(id);
+SELECT * FROM test.recursive_cte_test_tbl WHERE id = 5;
+
+WITH RECURSIVE test AS (
+	SELECT min(name) AS name
+	FROM test.recursive_cte_test_tbl
+	WHERE id = 5
+	UNION ALL
+	SELECT (SELECT min(name)
+			FROM test.recursive_cte_test_tbl
+			WHERE id = 5 AND name > test.name)
+	FROM test
+	WHERE name IS NOT NULL)
+SELECT * FROM test;
+
+
 DROP SCHEMA test CASCADE;
 DROP EXTENSION pg_pathman CASCADE;
 DROP SCHEMA pathman CASCADE;
