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

Merge branch 'master' of https://github.com/ClickHouse/ClickHouse into testflows_windows_functions_add_lag_and_lead_in_frame_tests

Browse Source
This commit is contained in:
Vitaliy Zakaznikov 2021-06-09 13:01:56 -04:00
commit 512c522558
4 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Interpreters/JoinToSubqueryTransformVisitor.cpp
View File

@ -91,7 +91,20 @@ public:
{
if (should_add_column_predicate(column.name))
{
auto identifier = std::make_shared<ASTIdentifier>(std::vector<String>{it->first, column.name});
ASTPtr identifier;
if (it->first.empty())
/// We want tables from JOIN to have aliases.
/// But it is possible to set joined_subquery_requires_alias = 0,
/// and write a query like `select * FROM (SELECT 1), (SELECT 1), (SELECT 1)`.
/// If so, table name will be empty here.
///
/// We cannot create compound identifier with empty part (there is an assert).
/// So, try our luck and use only column name.
/// (Rewriting AST for JOIN is not an efficient design).
identifier = std::make_shared<ASTIdentifier>(column.name);
else
identifier = std::make_shared<ASTIdentifier>(std::vector<String>{it->first, column.name});
new_select_expression_list->children.emplace_back(std::move(identifier));
}
}

14
src/Parsers/ASTIdentifier.cpp
View File

@ -80,7 +80,7 @@ void ASTIdentifier::setShortName(const String & new_name)
name_parts = {new_name};
bool special = semantic->special;
//how about keep the semantic info here, such as table
/// How about keep the semantic info here, such as table
auto table = semantic->table;
*semantic = IdentifierSemanticImpl();
@ -116,8 +116,14 @@ void ASTIdentifier::formatImplWithoutAlias(const FormatSettings & settings, Form
if (i != 0)
settings.ostr << '.';
if (name_parts[i].empty())
children[j++]->formatImpl(settings, state, frame);
/// Some AST rewriting code, like IdentifierSemantic::setColumnLongName,
/// does not respect children of identifier.
/// Here we also ignore children if they are empty.
if (name_parts[i].empty() && j < children.size())
{
children[j]->formatImpl(settings, state, frame);
++j;
}
else
format_element(name_parts[i]);
}
@ -125,7 +131,7 @@ void ASTIdentifier::formatImplWithoutAlias(const FormatSettings & settings, Form
else
{
const auto & name = shortName();
if (name.empty())
if (name.empty() && !children.empty())
children.front()->formatImpl(settings, state, frame);
else
format_element(name);

3
tests/queries/0_stateless/01890_cross_join_explain_crash.reference Normal file
View File

@ -0,0 +1,3 @@
2 1 1
1 2 1
1 1 2

8
tests/queries/0_stateless/01890_cross_join_explain_crash.sql Normal file
View File

@ -0,0 +1,8 @@
SET joined_subquery_requires_alias = 0;
select * FROM (SELECT 1), (SELECT 1), (SELECT 1); -- { serverError 352 }
-- This queries work by luck.
-- Feel free to remove then if it is the only failed test.
select * from (select 2), (select 1) as a, (select 1) as b;
select * from (select 1) as a, (select 2), (select 1) as b;
select * from (select 1) as a, (select 1) as b, (select 2);