thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 08:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added tests

Browse Source
This commit is contained in:
Maksim Kita 2022-10-19 12:29:59 +02:00
parent 90048ce75d
commit 39b2d25a43
3 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Analyzer/Passes/QueryAnalysisPass.cpp
View File

@ -5320,10 +5320,15 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
for (auto & node : with_nodes) for (auto & node : with_nodes)
{ {
auto * subquery_node = node->as<QueryNode>(); 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; 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); auto [_, inserted] = scope.cte_name_to_query_node.emplace(cte_name, node);
if (!inserted) if (!inserted)
throw Exception(ErrorCodes::MULTIPLE_EXPRESSIONS_FOR_ALIAS, 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) std::erase_if(with_nodes, [](const QueryTreeNodePtr & node)
{ {
auto * subquery_node = node->as<QueryNode>(); 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()) 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 * 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 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; scope.use_identifier_lookup_to_result_cache = false;

7
tests/queries/0_stateless/02387_analyzer_cte.reference Normal file
View File

@ -0,0 +1,7 @@
1
--
0 Value
--
1
--
0 Value

26
tests/queries/0_stateless/02387_analyzer_cte.sql Normal file
View File

@ -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;