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

Merge branch 'master' into better-union-all-try2

Browse Source
This commit is contained in:
Alexey Milovidov 2018-02-26 08:05:53 +03:00
commit a586fd119a
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Interpreters/ExpressionAnalyzer.cpp
View File

@ -1027,7 +1027,7 @@ void ExpressionAnalyzer::normalizeTreeImpl(
ASTs & asts = node->children; ASTs & asts = node->children;
for (int i = static_cast<int>(asts.size()) - 1; i >= 0; --i) for (int i = static_cast<int>(asts.size()) - 1; i >= 0; --i)
{ {
if (ASTAsterisk * asterisk = typeid_cast<ASTAsterisk *>(asts[i].get())) if (typeid_cast<ASTAsterisk *>(asts[i].get()))
{ {
ASTs all_columns; ASTs all_columns;
for (const auto & column_name_type : columns) for (const auto & column_name_type : columns)

2
dbms/src/Parsers/ASTQueryWithOutput.h
View File

@ -48,7 +48,7 @@ protected:
void formatQueryImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override void formatQueryImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override
{ {
settings.ostr << (settings.hilite ? hilite_keyword : "") settings.ostr << (settings.hilite ? hilite_keyword : "")
<< ASTIDAndQueryNames::Query << (settings.hilite ? hilite_none : ""); << ASTIDAndQueryNames::Query << (settings.hilite ? hilite_none : "");
} }
}; };

5
dbms/src/Parsers/ExpressionElementParsers.cpp
View File

@ -318,6 +318,7 @@ bool ParserCastExpression::parseImpl(Pos & pos, ASTPtr & node, Expected & expect
{ {
/// CAST(expression AS type) /// CAST(expression AS type)
const auto type = first_argument->tryGetAlias(); const auto type = first_argument->tryGetAlias();
if (type.empty()) if (type.empty())
{ {
/// there is only one argument and it has no alias /// there is only one argument and it has no alias
@ -609,7 +610,7 @@ bool ParserAliasImpl<ParserIdentifier>::parseImpl(Pos & pos, ASTPtr & node, Expe
ParserKeyword s_as("AS"); ParserKeyword s_as("AS");
ParserIdentifier id_p; ParserIdentifier id_p;
bool has_as_word = s_as.parse(pos, node, expected); bool has_as_word = s_as.ignore(pos, expected);
if (!allow_alias_without_as_keyword && !has_as_word) if (!allow_alias_without_as_keyword && !has_as_word)
return false; return false;
@ -746,7 +747,7 @@ bool ParserWithOptionalAliasImpl<ParserAlias>::parseImpl(Pos & pos, ASTPtr & nod
ASTPtr alias_node; ASTPtr alias_node;
if (ParserAlias(allow_alias_without_as_keyword_now).parse(pos, alias_node, expected)) if (ParserAlias(allow_alias_without_as_keyword_now).parse(pos, alias_node, expected))
{ {
String alias_name = typeid_cast<ASTIdentifier &>(*alias_node).name; String alias_name = typeid_cast<const ASTIdentifier &>(*alias_node).name;
if (ASTWithAlias * ast_with_alias = dynamic_cast<ASTWithAlias *>(node.get())) if (ASTWithAlias * ast_with_alias = dynamic_cast<ASTWithAlias *>(node.get()))
{ {

2
dbms/src/Parsers/IParserBase.cpp
View File

@ -22,7 +22,7 @@ bool IParserBase::parse(Pos & pos, ASTPtr & node, Expected & expected)
node = nullptr; node = nullptr;
pos = begin; pos = begin;
} }
else else if (node)
node->range = StringRange(begin, pos); node->range = StringRange(begin, pos);
return res; return res;

2
dbms/src/Parsers/ParserCreateQuery.cpp
View File

@ -80,7 +80,7 @@ bool ParserIdentifierWithOptionalParameters::parseImpl(Pos & pos, ASTPtr & node,
bool ParserTypeInCastExpression::parseImpl(Pos & pos, ASTPtr & node, Expected & expected) bool ParserTypeInCastExpression::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
{ {
if (ParserIdentifierWithOptionalParameters::parseImpl(pos, node, expected)) if (ParserIdentifierWithOptionalParameters().parse(pos, node, expected))
{ {
const auto & id_with_params = typeid_cast<const ASTFunction &>(*node); const auto & id_with_params = typeid_cast<const ASTFunction &>(*node);
node = std::make_shared<ASTIdentifier>(String{ id_with_params.range.first, id_with_params.range.second }); node = std::make_shared<ASTIdentifier>(String{ id_with_params.range.first, id_with_params.range.second });

2
dbms/src/Parsers/ParserCreateQuery.h
View File

@ -48,7 +48,7 @@ protected:
bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected); bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected);
}; };
class ParserTypeInCastExpression : public ParserIdentifierWithOptionalParameters class ParserTypeInCastExpression : public IParserBase
{ {
protected: protected:
const char * getName() const { return "type in cast expression"; } const char * getName() const { return "type in cast expression"; }