thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-02 04:22:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

analyzer implementation

Browse Source
This commit is contained in:
yariks5s 2024-01-10 13:38:46 +00:00
parent daa231c391
commit 7a1c1a3b62
4 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1207,6 +1207,8 @@ private:
static void validateJoinTableExpressionWithoutAlias(const QueryTreeNodePtr & join_node, const QueryTreeNodePtr & table_expression_node, IdentifierResolveScope & scope);
static void checkDuplicateTableNamesOrAlias(QueryTreeNodePtr & join_node, QueryTreeNodePtr & left_table_expr, QueryTreeNodePtr & right_table_expr);
static std::pair<bool, UInt64> recursivelyCollectMaxOrdinaryExpressions(QueryTreeNodePtr & node, QueryTreeNodes & into);
static void expandGroupByAll(QueryNode & query_tree_node_typed);
@ -6777,6 +6779,28 @@ void QueryAnalyzer::resolveArrayJoin(QueryTreeNodePtr & array_join_node, Identif
}
}
void QueryAnalyzer::checkDuplicateTableNamesOrAlias(QueryTreeNodePtr & join_node, QueryTreeNodePtr & left_table_expr, QueryTreeNodePtr & right_table_expr)
{
Names column_names;
auto * left_node = left_table_expr->as<QueryNode>();
auto * right_node = right_table_expr->as<QueryNode>();
for (const auto & name_and_type : left_node->getProjectionColumns())
column_names.push_back(name_and_type.name);
for (const auto & name_and_type : right_node->getProjectionColumns())
column_names.push_back(name_and_type.name);
if (column_names.empty())
return;
std::sort(column_names.begin(), column_names.end());
for (size_t i = 0; i < column_names.size() - 1; i++) // Check if there is not any duplicates because it will lead to broken result
if (column_names[i] == column_names[i+1])
throw Exception(ErrorCodes::BAD_ARGUMENTS,
"Name of columns and aliases should be unique for this query (you can add alias that will be different)"
"While processing '{}'", join_node->formatASTForErrorMessage());
}
/// Resolve join node in scope
void QueryAnalyzer::resolveJoin(QueryTreeNodePtr & join_node, IdentifierResolveScope & scope, QueryExpressionsAliasVisitor & expressions_visitor)
{
@ -6788,6 +6812,8 @@ void QueryAnalyzer::resolveJoin(QueryTreeNodePtr & join_node, IdentifierResolveS
resolveQueryJoinTreeNode(join_node_typed.getRightTableExpression(), scope, expressions_visitor);
validateJoinTableExpressionWithoutAlias(join_node, join_node_typed.getRightTableExpression(), scope);
checkDuplicateTableNamesOrAlias(join_node, join_node_typed.getLeftTableExpression(), join_node_typed.getRightTableExpression());
if (join_node_typed.isOnJoinExpression())
{
expressions_visitor.visit(join_node_typed.getJoinExpression());

2
src/Interpreters/JoinedTables.cpp
View File

@ -265,6 +265,8 @@ bool JoinedTables::resolveTables()
for (const auto & t : tables_with_columns)
for (auto & name : t.columns.getNames())
column_names.push_back(name);
if (column_names.empty())
return false;
std::sort(column_names.begin(), column_names.end());
for (size_t i = 0; i < column_names.size() - 1; i++) // Check if there is not any duplicates because it will lead to broken result

1
src/Parsers/ExpressionElementParsers.cpp
View File

@ -1451,6 +1451,7 @@ const char * ParserAlias::restricted_keywords[] =
"ASOF",
"BETWEEN",
"CROSS",
"PASTE",
"FINAL",
"FORMAT",
"FROM",

2
tests/queries/0_stateless/02933_paste_join.sql
View File

@ -38,4 +38,4 @@ select * from (SELECT number as a FROM numbers_mt(10)) t1 PASTE JOIN (select num
INSERT INTO test SELECT * FROM numbers(10);
SELECT * FROM (SELECT number FROM test) AS t1 PASTE JOIN (SELECT number FROM numbers(10) ORDER BY number DESC ) AS t2 SETTINGS joined_subquery_requires_alias = 0; -- { serverError BAD_ARGUMENTS }
SELECT * FROM (SELECT number FROM test) PASTE JOIN (SELECT number FROM numbers(10) ORDER BY number DESC ) SETTINGS joined_subquery_requires_alias = 0; -- { serverError BAD_ARGUMENTS }