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

clickouse: fixed aliases [#CONV-2944].

Browse Source
This commit is contained in:
Michael Kolupaev 2013-02-12 09:04:39 +00:00
parent 1f472dceca
commit 3e168c4cc0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dbms/src/Interpreters/Expression.cpp
View File

@ -63,9 +63,9 @@ void Expression::createAliasesDict(ASTPtr & ast)
std::string * alias = GetAlias(ast);
if (alias && !alias->empty())
{
if (aliases.count(*alias))
if (aliases.count(*alias) && ast != aliases[*alias])
{
throw Exception("Multiple expressions with the same alias " + *alias, ErrorCodes::MULTIPLE_EXPRESSIONS_FOR_ALIAS);
throw Exception("Differnt expressions with the same alias " + *alias, ErrorCodes::MULTIPLE_EXPRESSIONS_FOR_ALIAS);
}
else
{
@ -284,9 +284,9 @@ void Expression::glueTreeImpl(ASTPtr ast, Subtrees & subtrees)
{
*alias_ptr = initial_alias;
}
else if (!initial_alias.empty())
else if (!initial_alias.empty() && initial_alias != *alias_ptr)
{
throw Exception("Multiple aliases for the same expression", ErrorCodes::MULTIPLE_ALIASES_FOR_EXPRESSION);
throw Exception("Multiple aliases " + initial_alias + " and " + *alias_ptr + " for the same expression", ErrorCodes::MULTIPLE_ALIASES_FOR_EXPRESSION);
}
}
}