From de903143730a97204de7ced1f0e680909d983ad9 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Fri, 23 Jul 2021 02:37:38 +0300 Subject: [PATCH] Fix some tests --- .../0_stateless/01101_literal_column_clash.reference | 4 ---- tests/queries/0_stateless/01101_literal_column_clash.sql | 8 ++++---- tests/queries/0_stateless/01950_aliases_bad_cast.sql | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/tests/queries/0_stateless/01101_literal_column_clash.reference b/tests/queries/0_stateless/01101_literal_column_clash.reference index b89f59abb18..22844815f1e 100644 --- a/tests/queries/0_stateless/01101_literal_column_clash.reference +++ b/tests/queries/0_stateless/01101_literal_column_clash.reference @@ -3,9 +3,5 @@ 7 0 7 1 xyzabc 2 -1 3 1 2 0 0 -1 0 0 3 -\N 1 2 \N 0 -\N 1 0 \N 3 2 1 diff --git a/tests/queries/0_stateless/01101_literal_column_clash.sql b/tests/queries/0_stateless/01101_literal_column_clash.sql index 4a6064141ea..ea23f703f9f 100644 --- a/tests/queries/0_stateless/01101_literal_column_clash.sql +++ b/tests/queries/0_stateless/01101_literal_column_clash.sql @@ -7,13 +7,13 @@ join (select '1' as sid) as t2 on t2.sid = cast(t1.iid as String); select cast(7 as String), * from (select 3 "'String'"); select cast(7 as String), * from (select number "'String'" FROM numbers(2)); SELECT concat('xyz', 'abc'), * FROM (SELECT 2 AS "'xyz'"); -with 3 as "1" select 1, "1"; +with 3 as "1" select 1, "1"; -- { serverError 352 } -- https://github.com/ClickHouse/ClickHouse/issues/9953 select 1, * from (select 2 x) a left join (select 1, 3 y) b on y = x; -select 1, * from (select 2 x, 1) a right join (select 3 y) b on y = x; -select null, isConstant(null), * from (select 2 x) a left join (select null, 3 y) b on y = x; -select null, isConstant(null), * from (select 2 x, null) a right join (select 3 y) b on y = x; +select 1, * from (select 2 x, 1) a right join (select 3 y) b on y = x; -- { serverError 352 } +select null, isConstant(null), * from (select 2 x) a left join (select null, 3 y) b on y = x; -- { serverError 352 } +select null, isConstant(null), * from (select 2 x, null) a right join (select 3 y) b on y = x; -- { serverError 352 } -- other cases with joins and constants diff --git a/tests/queries/0_stateless/01950_aliases_bad_cast.sql b/tests/queries/0_stateless/01950_aliases_bad_cast.sql index a7265a1b020..bdd2339f855 100644 --- a/tests/queries/0_stateless/01950_aliases_bad_cast.sql +++ b/tests/queries/0_stateless/01950_aliases_bad_cast.sql @@ -1,2 +1,2 @@ -SELECT 1, * FROM (SELECT NULL AS `1`); -- { serverError 36 } -SELECT '7', 'xyz', * FROM (SELECT NULL AS `'xyz'`); -- { serverError 36 } +SELECT 1, * FROM (SELECT NULL AS `1`); -- { serverError 352 } +SELECT '7', 'xyz', * FROM (SELECT NULL AS `'xyz'`); -- { serverError 352 }