From 39b2d25a43911364ef3721e32e9d1fc685fe1dc2 Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Wed, 19 Oct 2022 12:29:59 +0200
Subject: [PATCH] Added tests

---
 src/Analyzer/Passes/QueryAnalysisPass.cpp     | 15 ++++++++---
 .../0_stateless/02387_analyzer_cte.reference  |  7 +++++
 .../0_stateless/02387_analyzer_cte.sql        | 26 +++++++++++++++++++
 3 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 tests/queries/0_stateless/02387_analyzer_cte.reference
 create mode 100644 tests/queries/0_stateless/02387_analyzer_cte.sql

diff --git a/src/Analyzer/Passes/QueryAnalysisPass.cpp b/src/Analyzer/Passes/QueryAnalysisPass.cpp
index afe89ce2696..21af0ace6ea 100644
--- a/src/Analyzer/Passes/QueryAnalysisPass.cpp
+++ b/src/Analyzer/Passes/QueryAnalysisPass.cpp
@@ -5320,10 +5320,15 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
     for (auto & node : with_nodes)
     {
         auto * subquery_node = node->as<QueryNode>();
-        if (!subquery_node || !subquery_node->isCTE())
+        auto * union_node = node->as<UnionNode>();
+
+        bool subquery_is_cte = (subquery_node && subquery_node->isCTE()) || (union_node && union_node->isCTE());
+
+        if (!subquery_is_cte)
             continue;
 
-        const auto & cte_name = subquery_node->getCTEName();
+        const auto & cte_name = subquery_node ? subquery_node->getCTEName() : union_node->getCTEName();
+
         auto [_, inserted] = scope.cte_name_to_query_node.emplace(cte_name, node);
         if (!inserted)
             throw Exception(ErrorCodes::MULTIPLE_EXPRESSIONS_FOR_ALIAS,
@@ -5335,7 +5340,9 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
     std::erase_if(with_nodes, [](const QueryTreeNodePtr & node)
     {
         auto * subquery_node = node->as<QueryNode>();
-        return subquery_node && subquery_node->isCTE();
+        auto * union_node = node->as<UnionNode>();
+
+        return (subquery_node && subquery_node->isCTE()) || (union_node && union_node->isCTE());
     });
 
     for (auto & window_node : query_node_typed.getWindow().getNodes())
@@ -5364,7 +5371,7 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
       *
       * Example: SELECT id FROM test_table AS t1 INNER JOIN test_table AS t2 ON t1.id = t2.id INNER JOIN test_table AS t3 ON t1.id = t3.id
       * In first join expression ON t1.id = t2.id t1.id is resolved into test_table.id column.
-      * IN second join expression ON t1.id = t3.id t1.id must be resolved into join column that wrap test_table.id column.
+      * In second join expression ON t1.id = t3.id t1.id must be resolved into test_table.id column after first JOIN.
       */
     scope.use_identifier_lookup_to_result_cache = false;
 
diff --git a/tests/queries/0_stateless/02387_analyzer_cte.reference b/tests/queries/0_stateless/02387_analyzer_cte.reference
new file mode 100644
index 00000000000..1ad3aee198b
--- /dev/null
+++ b/tests/queries/0_stateless/02387_analyzer_cte.reference
@@ -0,0 +1,7 @@
+1
+--
+0	Value
+--
+1
+--
+0	Value
diff --git a/tests/queries/0_stateless/02387_analyzer_cte.sql b/tests/queries/0_stateless/02387_analyzer_cte.sql
new file mode 100644
index 00000000000..725e18af315
--- /dev/null
+++ b/tests/queries/0_stateless/02387_analyzer_cte.sql
@@ -0,0 +1,26 @@
+SET use_analyzer = 1;
+
+DROP TABLE IF EXISTS test_table;
+CREATE TABLE test_table
+(
+    id UInt64,
+    value String
+) ENGINE=TinyLog;
+
+INSERT INTO test_table VALUES (0, 'Value');
+
+WITH cte_subquery AS (SELECT 1) SELECT * FROM cte_subquery;
+
+SELECT '--';
+
+WITH cte_subquery AS (SELECT * FROM test_table) SELECT * FROM cte_subquery;
+
+SELECT '--';
+
+WITH cte_subquery AS (SELECT 1 UNION DISTINCT SELECT 1) SELECT * FROM cte_subquery;
+
+SELECT '--';
+
+WITH cte_subquery AS (SELECT * FROM test_table UNION DISTINCT SELECT * FROM test_table) SELECT * FROM cte_subquery;
+
+DROP TABLE test_table;