Skip to content

Commit e361051

Browse files
zachmuzachmu
committed
Clean up tests and skip failing ones
1 parent 282488a commit e361051

File tree

1 file changed

+39
-43
lines changed

1 file changed

+39
-43
lines changed

‎enginetest/queries/script_queries.go

Lines changed: 39 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1675,7 +1675,7 @@ CREATE TABLE tab3 (
16751675
"INSERT INTO tab2 VALUES (1, 'b'), (2, 'm'), (3, 'g')",
16761676
"SELECT m.id, t.s FROM tab1 m JOIN tab2 t on m.id = t.i2 ORDER BY t.s DESC LIMIT 1 INTO @myId, @myText",
16771677
// TODO: union statement does not handle order by and limit clauses
1678-
//"SELECT id FROM tab1 UNION select s FROM tab2 LIMIT 1 INTO @myUnion",
1678+
// "SELECT id FROM tab1 UNION select s FROM tab2 LIMIT 1 INTO @myUnion",
16791679
"SELECT id FROM tab1 WHERE id > 3 UNION select s FROM tab2 WHERE s < 'f' INTO @mustSingleVar",
16801680
},
16811681
Assertions: []ScriptTestAssertion{
@@ -2765,41 +2765,27 @@ CREATE TABLE tab3 (
27652765
Dialect: "mysql",
27662766
SetUpScript: []string{
27672767
"CREATE TABLE test_data (id INT PRIMARY KEY, name VARCHAR(50), age INT, category VARCHAR(10))",
2768-
"INSERT INTO test_data VALUES (1, 'Alice', 25, 'A'), (2, 'Bob', 30, 'B'), (3, 'Charlie', 22, 'A'), (4, 'Diana', 28, 'C'), (5, 'Eve', 35, 'B'), (6, 'Frank', 26, 'A')",
2769-
},
2770-
Assertions: []ScriptTestAssertion{
2771-
{
2772-
Query: "SELECT category, group_concat(name ORDER BY (SELECT COUNT(*) FROM test_data t2 WHERE t2.category = test_data.category AND t2.age < test_data.age)) FROM test_data GROUP BY category ORDER BY category",
2773-
Expected: []sql.Row{{"A", "Charlie,Alice,Frank"}, {"B", "Bob,Eve"}, {"C", "Diana"}},
2774-
},
2775-
{
2776-
Query: "SELECT group_concat(name ORDER BY (SELECT AVG(age) FROM test_data t2 WHERE t2.category = test_data.category)) FROM test_data",
2777-
Expected: []sql.Row{{"Charlie,Alice,Frank,Bob,Eve,Diana"}},
2778-
},
2779-
{
2780-
Query: "SELECT category, group_concat(name ORDER BY (SELECT MAX(age) FROM test_data t2 WHERE t2.id <= test_data.id)) FROM test_data GROUP BY category ORDER BY category",
2781-
Expected: []sql.Row{{"A", "Alice,Charlie,Frank"}, {"B", "Bob,Eve"}, {"C", "Diana"}},
2782-
},
2783-
},
2784-
},
2785-
{
2786-
Name: "Group Concat with Subquery in ORDER BY",
2787-
Dialect: "mysql",
2788-
SetUpScript: []string{
2789-
"CREATE TABLE test_data (id INT PRIMARY KEY, name VARCHAR(50), age INT, category VARCHAR(10))",
2790-
"INSERT INTO test_data VALUES (1, 'Alice', 25, 'A'), (2, 'Bob', 30, 'B'), (3, 'Charlie', 22, 'A'), (4, 'Diana', 28, 'C'), (5, 'Eve', 35, 'B'), (6, 'Frank', 26, 'A')",
2768+
`INSERT INTO test_data VALUES
2769+
(1, 'Alice', 25, 'A'),
2770+
(2, 'Bob', 30, 'B'),
2771+
(3, 'Charlie', 22, 'A'),
2772+
(4, 'Diana', 28, 'C'),
2773+
(5, 'Eve', 35, 'B'),
2774+
(6, 'Frank', 26, 'A')`,
27912775
},
27922776
Assertions: []ScriptTestAssertion{
27932777
{
2778+
Skip: true,
27942779
Query: "SELECT category, group_concat(name ORDER BY (SELECT COUNT(*) FROM test_data t2 WHERE t2.category = test_data.category AND t2.age < test_data.age)) FROM test_data GROUP BY category ORDER BY category",
27952780
Expected: []sql.Row{{"A", "Charlie,Alice,Frank"}, {"B", "Bob,Eve"}, {"C", "Diana"}},
27962781
},
27972782
{
2798-
Query: "SELECT group_concat(name ORDER BY (SELECT AVG(age) FROM test_data t2 WHERE t2.category = test_data.category)) FROM test_data",
2799-
Expected: []sql.Row{{"Charlie,Alice,Frank,Bob,Eve,Diana"}},
2783+
Skip: true,
2784+
Query: "SELECT group_concat(name ORDER BY (SELECT AVG(age) FROM test_data t2 WHERE t2.category = test_data.category), id) FROM test_data;",
2785+
Expected: []sql.Row{{"Alice,Charlie,Frank,Diana,Bob,Eve"}},
28002786
},
28012787
{
2802-
Query: "SELECT category, group_concat(name ORDER BY (SELECT MAX(age) FROM test_data t2 WHERE t2.id <= test_data.id)) FROM test_data GROUP BY category ORDER BY category",
2788+
Query: "SELECT category, group_concat(name ORDER BY (SELECT MAX(age) FROM test_data t2 WHERE t2.id <= test_data.id)) FROM test_data GROUP BY category ORDER BY category",
28032789
Expected: []sql.Row{{"A", "Alice,Charlie,Frank"}, {"B", "Bob,Eve"}, {"C", "Diana"}},
28042790
},
28052791
},
@@ -2818,18 +2804,22 @@ CREATE TABLE tab3 (
28182804
},
28192805
Assertions: []ScriptTestAssertion{
28202806
{
2821-
Query: "SELECT category_id, GROUP_CONCAT(name ORDER BY (SELECT rating FROM suppliers WHERE suppliers.id = products.supplier_id) DESC) FROM products GROUP BY category_id ORDER BY category_id",
2822-
Expected: []sql.Row{{1, "Laptop,Keyboard,Monitor,Mouse"}, {2, "Chair,Desk"}},
2807+
Skip: true,
2808+
Query: "SELECT category_id, GROUP_CONCAT(name ORDER BY (SELECT rating FROM suppliers WHERE suppliers.id = products.supplier_id) DESC, id ASC) FROM products GROUP BY category_id ORDER BY category_id",
2809+
Expected: []sql.Row{{1, "Laptop,Keyboard,Mouse,Monitor"}, {2, "Chair,Desk"}},
28232810
},
28242811
{
2825-
Query: "SELECT GROUP_CONCAT(name ORDER BY (SELECT COUNT(*) FROM products p2 WHERE p2.price < products.price)) FROM products",
2826-
Expected: []sql.Row{{"Mouse,Keyboard,Desk,Monitor,Chair,Laptop"}},
2812+
Skip: true,
2813+
Query: "SELECT GROUP_CONCAT(name ORDER BY (SELECT COUNT(*) FROM products p2 WHERE p2.price < products.price), id) FROM products",
2814+
Expected: []sql.Row{{"Mouse,Keyboard,Chair,Monitor,Desk,Laptop"}},
28272815
},
28282816
{
2817+
Skip: true,
28292818
Query: "SELECT category_id, GROUP_CONCAT(DISTINCT supplier_id ORDER BY (SELECT rating FROM suppliers WHERE suppliers.id = products.supplier_id)) FROM products GROUP BY category_id",
28302819
Expected: []sql.Row{{1, "2,1"}, {2, "3"}},
28312820
},
28322821
{
2822+
Skip: true,
28332823
Query: "SELECT GROUP_CONCAT(name ORDER BY (SELECT priority FROM categories WHERE categories.id = products.category_id), price) FROM products",
28342824
Expected: []sql.Row{{"Mouse,Keyboard,Monitor,Laptop,Chair,Desk"}},
28352825
},
@@ -2841,7 +2831,7 @@ CREATE TABLE tab3 (
28412831
},
28422832
{
28432833
Name: "Group Concat Subquery ORDER BY Error Cases",
2844-
Dialect: "mysql",
2834+
Dialect: "mysql",
28452835
SetUpScript: []string{
28462836
"CREATE TABLE test_table (id INT PRIMARY KEY, name VARCHAR(50), value INT)",
28472837
"INSERT INTO test_table VALUES (1, 'A', 10), (2, 'B', 20), (3, 'C', 30)",
@@ -2871,18 +2861,21 @@ CREATE TABLE tab3 (
28712861
Assertions: []ScriptTestAssertion{
28722862
{
28732863
// Test with subquery returning NULL values
2874-
Query: "SELECT category, GROUP_CONCAT(name ORDER BY (SELECT CASE WHEN complex_test.value > 80 THEN NULL ELSE complex_test.value END)) FROM complex_test GROUP BY category ORDER BY category",
2875-
Expected: []sql.Row{{"X", "Gamma,Alpha"}, {"Y", "Beta,Epsilon"}, {"Z", "Delta"}},
2864+
Skip: true,
2865+
Query: "SELECT category, GROUP_CONCAT(name ORDER BY (SELECT CASE WHEN complex_test.value > 80 THEN NULL ELSE complex_test.value END), name) FROM complex_test GROUP BY category ORDER BY category",
2866+
Expected: []sql.Row{{"X", "Alpha,Gamma"}, {"Y", "Epsilon,Beta"}, {"Z", "Delta"}},
28762867
},
28772868
{
28782869
// Test with correlated subquery using multiple tables
2879-
Query: "SELECT GROUP_CONCAT(name ORDER BY (SELECT COUNT(*) FROM complex_test c2 WHERE c2.category = complex_test.category AND c2.value > complex_test.value)) FROM complex_test",
2880-
Expected: []sql.Row{{"Alpha,Gamma,Epsilon,Beta,Delta"}},
2870+
Skip: true,
2871+
Query: "SELECT GROUP_CONCAT(name ORDER BY (SELECT COUNT(*) FROM complex_test c2 WHERE c2.category = complex_test.category AND c2.value > complex_test.value), name) FROM complex_test",
2872+
Expected: []sql.Row{{"Alpha,Delta,Epsilon,Beta,Gamma"}},
28812873
},
28822874
{
28832875
// Test with subquery using aggregate functions with HAVING
2884-
Query: "SELECT category, GROUP_CONCAT(name ORDER BY (SELECT AVG(value) FROM complex_test c2 WHERE c2.id <= complex_test.id HAVING AVG(value) > 50) DESC) FROM complex_test GROUP BY category ORDER BY category",
2885-
Expected: []sql.Row{{"X", "Alpha,Gamma"}, {"Y", "Epsilon,Beta"}, {"Z", "Delta"}},
2876+
Skip: true,
2877+
Query: "SELECT category, GROUP_CONCAT(name ORDER BY (SELECT AVG(value), name FROM complex_test c2 WHERE c2.id <= complex_test.id HAVING AVG(value) > 50) DESC) FROM complex_test GROUP BY category ORDER BY category",
2878+
Expected: []sql.Row{{"X", "Alpha,Gamma"}, {"Y", "Beta,Epsilon"}, {"Z", "Delta"}},
28862879
},
28872880
{
28882881
// Test with DISTINCT and complex subquery
@@ -2891,8 +2884,9 @@ CREATE TABLE tab3 (
28912884
},
28922885
{
28932886
// Test with nested subqueries
2887+
Skip: true,
28942888
Query: "SELECT GROUP_CONCAT(name ORDER BY (SELECT COUNT(*) FROM complex_test c2 WHERE c2.value > (SELECT MIN(value) FROM complex_test c3 WHERE c3.category = complex_test.category))) FROM complex_test",
2895-
Expected: []sql.Row{{"Delta,Beta,Gamma,Epsilon,Alpha"}},
2889+
Expected: []sql.Row{{"Gamma,Alpha,Epsilon,Beta,Delta"}},
28962890
},
28972891
},
28982892
},
@@ -2911,11 +2905,13 @@ CREATE TABLE tab3 (
29112905
},
29122906
{
29132907
// Test with subquery using LIMIT
2908+
Skip: true,
29142909
Query: "SELECT GROUP_CONCAT(data ORDER BY (SELECT weight FROM perf_test p2 WHERE p2.id = perf_test.id LIMIT 1)) FROM perf_test",
29152910
Expected: []sql.Row{{"C,A,E,B,D"}},
29162911
},
29172912
{
29182913
// Test with very small decimal differences in ORDER BY subquery
2914+
Skip: true,
29192915
Query: "SELECT GROUP_CONCAT(data ORDER BY (SELECT weight + 0.001 * perf_test.id FROM perf_test p2 WHERE p2.id = perf_test.id)) FROM perf_test",
29202916
Expected: []sql.Row{{"C,A,E,B,D"}},
29212917
},
@@ -3159,7 +3155,7 @@ CREATE TABLE tab3 (
31593155
`CREATE TABLE t1 (pk int PRIMARY KEY, v1 varchar(10))`,
31603156
`INSERT INTO t1 VALUES (1,"1"), (2,"2"), (3,"3")`,
31613157
`CREATE TABLE t2 AS SELECT * FROM t1`,
3162-
//`CREATE TABLE t3(v0 int) AS SELECT pk FROM t1`, // parser problems
3158+
// `CREATE TABLE t3(v0 int) AS SELECT pk FROM t1`, // parser problems
31633159
`CREATE TABLE t3 AS SELECT pk FROM t1`,
31643160
`CREATE TABLE t4 AS SELECT pk, v1 FROM t1`,
31653161
`CREATE TABLE t5 SELECT * FROM t1 ORDER BY pk LIMIT 1`,
@@ -3324,7 +3320,7 @@ CREATE TABLE tab3 (
33243320
},
33253321
},
33263322
},
3327-
//todo(max): fix arithmatic on bindvar typing
3323+
// todo(max): fix arithmatic on bindvar typing
33283324
SkipPrepared: true,
33293325
},
33303326
{
@@ -4354,7 +4350,7 @@ CREATE TABLE tab3 (
43544350
// but GMS builds GroupBy for any aggregate function.
43554351
Skip: true,
43564352
Query: "select count(*) from numbers having count(*) > val;",
4357-
//ExpectedErrStr: "found HAVING clause with no GROUP BY", // not the exact error we want
4353+
// ExpectedErrStr: "found HAVING clause with no GROUP BY", // not the exact error we want
43584354
},
43594355
{
43604356
Query: "select count(*) from numbers group by val having count(*) < val;",
@@ -4366,7 +4362,7 @@ CREATE TABLE tab3 (
43664362
Name: "using having and group by clauses in subquery ",
43674363
SetUpScript: []string{
43684364
"CREATE TABLE t (i int, t varchar(2));",
4369-
"insert into t values (1, 'a'), (1, 'a2'), (2, 'b'), (3, 'c'), (3, 'c2'), (4, 'd'), (5, 'e'), (5, 'e2');", //, (6, 'f'), (7, 'g'), (7, 'g2')
4365+
"insert into t values (1, 'a'), (1, 'a2'), (2, 'b'), (3, 'c'), (3, 'c2'), (4, 'd'), (5, 'e'), (5, 'e2');", // , (6, 'f'), (7, 'g'), (7, 'g2')
43704366
},
43714367
Assertions: []ScriptTestAssertion{
43724368
{

0 commit comments

Comments
 (0)