Backport #56274 to 23.9: Fix incomplete query result for UNION in view() function.

robot-clickhouse · robot-clickhouse · commit dd7b9fa8e8d6 · 2023-11-16T19:03:35.000Z
diff --git a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp
@@ -28,8 +28,14 @@ void NormalizeSelectWithUnionQueryMatcher::getSelectsFromUnionListNode(ASTPtr as
 
 void NormalizeSelectWithUnionQueryMatcher::visit(ASTPtr & ast, Data & data)
 {
-    if (auto * select_union = ast->as<ASTSelectWithUnionQuery>())
+    if (auto * select_union = ast->as<ASTSelectWithUnionQuery>(); select_union && !select_union->is_normalized)
+    {
+        /// The rewrite of ASTSelectWithUnionQuery may strip the format info, so
+        /// we need to keep and restore it.
+        auto format = select_union->format;
         visit(*select_union, data);
+        select_union->format = format;
+    }
 }
 
 void NormalizeSelectWithUnionQueryMatcher::visit(ASTSelectWithUnionQuery & ast, Data & data)
diff --git a/tests/analyzer_tech_debt.txt b/tests/analyzer_tech_debt.txt
@@ -83,7 +83,6 @@
 02345_implicit_transaction
 02352_grouby_shadows_arg
 02354_annoy
-02366_union_decimal_conversion
 02375_rocksdb_with_filters
 02382_join_and_filtering_set
 02402_merge_engine_with_view
diff --git a/tests/queries/0_stateless/00612_union_query_with_subquery.reference b/tests/queries/0_stateless/00612_union_query_with_subquery.reference
@@ -10,3 +10,4 @@
 1
 1
 2
+3
diff --git a/tests/queries/0_stateless/00612_union_query_with_subquery.sql b/tests/queries/0_stateless/00612_union_query_with_subquery.sql
@@ -1,2 +1,3 @@
 SELECT * FROM ((SELECT * FROM system.numbers LIMIT 1) UNION ALL SELECT * FROM system.numbers LIMIT 2 UNION ALL (SELECT * FROM system.numbers LIMIT 3)) ORDER BY number;
 SELECT * FROM (SELECT * FROM system.numbers LIMIT 1 UNION ALL (SELECT * FROM system.numbers LIMIT 2 UNION ALL (SELECT * FROM system.numbers LIMIT 3))) ORDER BY number;
+select count() from view(select 1 union all (select 2 union all select 3));

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,14 @@ void NormalizeSelectWithUnionQueryMatcher::getSelectsFromUnionListNode(ASTPtr as`
`28`	`28`
`29`	`29`	`void NormalizeSelectWithUnionQueryMatcher::visit(ASTPtr & ast, Data & data)`
`30`	`30`	`{`
`31`		`- if (auto * select_union = ast->as<ASTSelectWithUnionQuery>())`
	`31`	`+ if (auto * select_union = ast->as<ASTSelectWithUnionQuery>(); select_union && !select_union->is_normalized)`
	`32`	`+ {`
	`33`	`+ /// The rewrite of ASTSelectWithUnionQuery may strip the format info, so`
	`34`	`+ /// we need to keep and restore it.`
	`35`	`+ auto format = select_union->format;`
`32`	`36`	`visit(*select_union, data);`
	`37`	`+ select_union->format = format;`
	`38`	`+ }`
`33`	`39`	`}`
`34`	`40`
`35`	`41`	`void NormalizeSelectWithUnionQueryMatcher::visit(ASTSelectWithUnionQuery & ast, Data & data)`
Original file line number	Diff line number	Diff line change
`@@ -10,3 +10,4 @@`
`10`	`10`	`1`
`11`	`11`	`1`
`12`	`12`	`2`
	`13`	`+3`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`SELECT * FROM ((SELECT * FROM system.numbers LIMIT 1) UNION ALL SELECT * FROM system.numbers LIMIT 2 UNION ALL (SELECT * FROM system.numbers LIMIT 3)) ORDER BY number;`
`2`	`2`	`SELECT * FROM (SELECT * FROM system.numbers LIMIT 1 UNION ALL (SELECT * FROM system.numbers LIMIT 2 UNION ALL (SELECT * FROM system.numbers LIMIT 3))) ORDER BY number;`
	`3`	`+select count() from view(select 1 union all (select 2 union all select 3));`