thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-11 10:04:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Analyzer subquery resolve fix

Browse Source
This commit is contained in:
Maksim Kita 2023-01-31 14:59:35 +01:00
parent 70eb41c6a8
commit 7e58e23d3a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1087,6 +1087,8 @@ private:
static bool isFunctionExpressionNodeType(QueryTreeNodeType node_type); static bool isFunctionExpressionNodeType(QueryTreeNodeType node_type);
static bool isSubqueryNodeType(QueryTreeNodeType node_type);
static bool isTableExpressionNodeType(QueryTreeNodeType node_type); static bool isTableExpressionNodeType(QueryTreeNodeType node_type);
static DataTypePtr getExpressionNodeResultTypeOrNull(const QueryTreeNodePtr & query_tree_node); static DataTypePtr getExpressionNodeResultTypeOrNull(const QueryTreeNodePtr & query_tree_node);
@ -1297,10 +1299,15 @@ bool QueryAnalyzer::isFunctionExpressionNodeType(QueryTreeNodeType node_type)
return node_type == QueryTreeNodeType::LAMBDA; return node_type == QueryTreeNodeType::LAMBDA;
} }
bool QueryAnalyzer::isSubqueryNodeType(QueryTreeNodeType node_type)
{
return node_type == QueryTreeNodeType::QUERY || node_type == QueryTreeNodeType::UNION;
}
bool QueryAnalyzer::isTableExpressionNodeType(QueryTreeNodeType node_type) bool QueryAnalyzer::isTableExpressionNodeType(QueryTreeNodeType node_type)
{ {
return node_type == QueryTreeNodeType::TABLE || node_type == QueryTreeNodeType::TABLE_FUNCTION || return node_type == QueryTreeNodeType::TABLE || node_type == QueryTreeNodeType::TABLE_FUNCTION ||
node_type == QueryTreeNodeType::QUERY || node_type == QueryTreeNodeType::UNION; isSubqueryNodeType(node_type);
} }
DataTypePtr QueryAnalyzer::getExpressionNodeResultTypeOrNull(const QueryTreeNodePtr & query_tree_node) DataTypePtr QueryAnalyzer::getExpressionNodeResultTypeOrNull(const QueryTreeNodePtr & query_tree_node)
@ -4923,7 +4930,7 @@ ProjectionNames QueryAnalyzer::resolveExpressionNode(QueryTreeNodePtr & node, Id
* alias table because in alias table subquery could be evaluated as scalar. * alias table because in alias table subquery could be evaluated as scalar.
*/ */
bool use_alias_table = true; bool use_alias_table = true;
if (scope.nodes_with_duplicated_aliases.contains(node) || (allow_table_expression && node->getNodeType() == QueryTreeNodeType::QUERY)) if (scope.nodes_with_duplicated_aliases.contains(node) || (allow_table_expression && isSubqueryNodeType(node->getNodeType())))
use_alias_table = false; use_alias_table = false;
if (!node_alias.empty() && use_alias_table) if (!node_alias.empty() && use_alias_table)