Changeset: fd44cced788e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/fd44cced788e Modified Files: sql/test/cte/Tests/cte_colname_issue_10074.test sql/test/cte/Tests/game_of_life.test sql/test/cte/Tests/incorrect_recursive_cte.test sql/test/cte/Tests/insert_cte_bug_3417.test sql/test/cte/Tests/recursive_cte_complex_pipelines.test sql/test/cte/Tests/recursive_cte_error.test sql/test/cte/Tests/recursive_hang_2745.test sql/test/cte/Tests/test_correlated_recursive_cte.test sql/test/cte/Tests/test_cte.test sql/test/cte/Tests/test_cte_in_cte.test sql/test/cte/Tests/test_cte_overflow.test sql/test/cte/Tests/test_issue_5673.test sql/test/cte/Tests/test_nested_recursive_cte.test sql/test/cte/Tests/test_outer_joins_recursive_cte.test sql/test/cte/Tests/test_recursive_cte_tutorial.test sql/test/cte/Tests/test_recursive_cte_union.test sql/test/cte/Tests/test_recursive_cte_union_all.test sql/test/miscellaneous/Tests/decimal-atoms.test Branch: recursive_cte Log Message:
Test normalization. diffs (truncated from 1359 to 300 lines): diff --git a/sql/test/cte/Tests/cte_colname_issue_10074.test b/sql/test/cte/Tests/cte_colname_issue_10074.test --- a/sql/test/cte/Tests/cte_colname_issue_10074.test +++ b/sql/test/cte/Tests/cte_colname_issue_10074.test @@ -2,7 +2,8 @@ statement ok create table t as with q(id,s) as (values(1,42)), a(s) as (select 42) select id from q join a on q.s=a.s -query I +query I nosort select id from t ---- 1 + diff --git a/sql/test/cte/Tests/game_of_life.test b/sql/test/cte/Tests/game_of_life.test --- a/sql/test/cte/Tests/game_of_life.test +++ b/sql/test/cte/Tests/game_of_life.test @@ -1,8 +1,8 @@ statement ok -create table series as select * from generate_series(-1,1+1) x(n); +create table series as select * from generate_series(-1,1+1) x(n) # conway -query III +query III nosort with recursive generation1(x,y) as ( --the initial board setup select 2, 3 union all @@ -37,7 +37,7 @@ 4 3 4 -query III +query III nosort with recursive generation1(x,y) as ( --the initial board setup select 2, 3 union @@ -71,3 +71,4 @@ 3 4 3 4 + diff --git a/sql/test/cte/Tests/incorrect_recursive_cte.test b/sql/test/cte/Tests/incorrect_recursive_cte.test --- a/sql/test/cte/Tests/incorrect_recursive_cte.test +++ b/sql/test/cte/Tests/incorrect_recursive_cte.test @@ -1,6 +1,6 @@ # recursive CTE without UNION is just a normal CTE -query I -WITH RECURSIVE cte AS (SELECT 42) SELECT * FROM cte; +query I nosort +WITH RECURSIVE cte AS (SELECT 42) SELECT * FROM cte ---- 42 @@ -12,3 +12,4 @@ with recursive t as (select 1 as x inter statement error with recursive t as (select 1 as x except select x+1 from t where x < 3) select * from t order by x ---- + diff --git a/sql/test/cte/Tests/insert_cte_bug_3417.test b/sql/test/cte/Tests/insert_cte_bug_3417.test --- a/sql/test/cte/Tests/insert_cte_bug_3417.test +++ b/sql/test/cte/Tests/insert_cte_bug_3417.test @@ -1,9 +1,10 @@ statement ok -CREATE TABLE table1 (id INTEGER, a INTEGER); +CREATE TABLE table1 (id INTEGER, a INTEGER) statement ok -CREATE TABLE table2 (table1_id INTEGER); +CREATE TABLE table2 (table1_id INTEGER) statement error INSERT INTO table2 WITH cte AS (INSERT INTO table1 SELECT 1, 2 RETURNING id) SELECT id FROM cte; ---- + diff --git a/sql/test/cte/Tests/recursive_cte_complex_pipelines.test b/sql/test/cte/Tests/recursive_cte_complex_pipelines.test --- a/sql/test/cte/Tests/recursive_cte_complex_pipelines.test +++ b/sql/test/cte/Tests/recursive_cte_complex_pipelines.test @@ -1,5 +1,5 @@ # recursive CTE with various cross products -query I +query I nosort WITH RECURSIVE t AS ( SELECT CAST(1 as BIGINT) AS x @@ -8,7 +8,7 @@ UNION FROM t t1, t t2, t t3 WHERE t1.x < 100 ) -SELECT * FROM t ORDER BY 1; +SELECT * FROM t ORDER BY 1 ---- 1 3 @@ -18,7 +18,7 @@ 81 243 # what if we have different types? -query I +query I nosort WITH RECURSIVE t AS ( SELECT cast(1 as HUGEINT) AS x @@ -27,7 +27,7 @@ UNION FROM t t1, t t2, t t3 WHERE t1.x < 100 ) -SELECT * FROM t ORDER BY 1; +SELECT * FROM t ORDER BY 1 ---- 1 3 @@ -40,7 +40,7 @@ statement ok CREATE TABLE a AS SELECT * FROM generate_series(1,100+1) t1(i) # recursive CTE with aggregates -query I +query I nosort WITH RECURSIVE t AS ( SELECT cast(1 as BIGINT) AS x @@ -49,7 +49,7 @@ UNION FROM t, a WHERE x < 1000000 ) -SELECT * FROM t ORDER BY 1 NULLS LAST; +SELECT * FROM t ORDER BY 1 NULLS LAST ---- 1 100 @@ -58,7 +58,7 @@ 1000000 NULL # the same but with a hash join -query I +query I nosort WITH RECURSIVE t AS ( SELECT cast(1 as BIGINT) AS x @@ -67,12 +67,12 @@ UNION FROM t, a WHERE x < 1000000 AND t.x=a.i ) -SELECT * FROM t ORDER BY 1 NULLS LAST; +SELECT * FROM t ORDER BY 1 NULLS LAST ---- 1 # nested aggregates -query I +query I nosort WITH RECURSIVE t AS ( SELECT CAST(1 as BIGINT) AS x @@ -82,7 +82,7 @@ UNION (SELECT SUM(x) FROM t) t1(x), a WHERE x < 1000 ) -SELECT * FROM t ORDER BY 1 NULLS LAST; +SELECT * FROM t ORDER BY 1 NULLS LAST ---- 1 100 @@ -90,7 +90,7 @@ 10000 NULL # non-correlated subqueries -query I +query I nosort WITH RECURSIVE t AS ( SELECT CAST(1 as BIGINT) AS x @@ -99,7 +99,7 @@ UNION FROM t WHERE x < 5 ) -SELECT * FROM t ORDER BY 1 NULLS LAST; +SELECT * FROM t ORDER BY 1 NULLS LAST ---- 1 2 @@ -108,7 +108,7 @@ 4 5 # correlated subqueries -query I +query I nosort WITH RECURSIVE t AS ( SELECT 1 AS x @@ -117,10 +117,11 @@ UNION FROM t WHERE x < 10 ) -SELECT * FROM t ORDER BY 1 NULLS LAST; +SELECT * FROM t ORDER BY 1 NULLS LAST ---- 1 2 4 8 16 + diff --git a/sql/test/cte/Tests/recursive_cte_error.test b/sql/test/cte/Tests/recursive_cte_error.test --- a/sql/test/cte/Tests/recursive_cte_error.test +++ b/sql/test/cte/Tests/recursive_cte_error.test @@ -1,12 +1,11 @@ statement ok -CREATE TABLE tag(id int, name string, subclassof int); +CREATE TABLE tag(id int, name string, subclassof int) statement ok INSERT INTO tag VALUES (7, 'Music', 9), (8, 'Movies', 9), (9, 'Art', NULL) -; statement error WITH RECURSIVE tag_hierarchy(id, source, path, target) AS ( @@ -22,3 +21,4 @@ SELECT source, path, target FROM tag_hierarchy ; ---- + diff --git a/sql/test/cte/Tests/recursive_hang_2745.test b/sql/test/cte/Tests/recursive_hang_2745.test --- a/sql/test/cte/Tests/recursive_hang_2745.test +++ b/sql/test/cte/Tests/recursive_hang_2745.test @@ -1,4 +1,4 @@ -query III +query III nosort with RECURSIVE parents_tab (id , value , parent ) as (values (1, 1, 2), (2, 2, 4), (3, 1, 4), (4, 2, -1), (5, 1, 2), (6, 2, 7), (7, 1, -1) ), @@ -10,7 +10,7 @@ parents as ( union all select id, value+2, parent from parents_tab2 ) -select * from parents order by id, value, parent; +select * from parents order by id, value, parent ---- 1 1 @@ -55,7 +55,7 @@ 7 3 -1 -query III +query III nosort with RECURSIVE parents_tab (id , value , parent ) as (values (1, 1, 2), (2, 2, 4), (3, 1, 4), (4, 2, -1), (5, 1, 2), (6, 2, 7), (7, 1, -1) ), @@ -64,7 +64,7 @@ as (values (1, 1, 2), (2, 2, 4), (3, 1, ) select * from parents_tab union all -select id, value+2, parent from parents_tab2 ORDER BY id, value, parent; +select id, value+2, parent from parents_tab2 ORDER BY id, value, parent ---- 1 1 @@ -109,7 +109,7 @@ 7 3 -1 -query III +query III nosort with parents_tab (id , value , parent ) as (values (1, 1, 2), (2, 2, 4), (3, 1, 4), (4, 2, -1), (5, 1, 2), (6, 2, 7), (7, 1, -1) ), @@ -121,7 +121,7 @@ parents as ( union all select id, value+2, parent from parents_tab2 ) -select * from parents ORDER BY id, value, parent; +select * from parents ORDER BY id, value, parent ---- 1 1 @@ -176,10 +176,10 @@ as (values (1, 1, 2), (2, 2, 4), (3, 1, ) select * from parents_tab union all -select id, value+2, parent from parents_tab2; +select id, value+2, parent from parents_tab2 query III rowsort -select * from vparents; +select * from vparents ---- 1 1 @@ -223,3 +223,4 @@ 1 7 3 -1 + diff --git a/sql/test/cte/Tests/test_correlated_recursive_cte.test b/sql/test/cte/Tests/test_correlated_recursive_cte.test --- a/sql/test/cte/Tests/test_correlated_recursive_cte.test +++ b/sql/test/cte/Tests/test_correlated_recursive_cte.test @@ -1,5 +1,5 @@ _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org