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

clickhouse: fixed SHOW DATABASES ... FORMAT [#CONV-6767].

Browse Source
This commit is contained in:
Michael Kolupaev 2013-02-21 10:39:24 +00:00
parent 40d71ab381
commit 1fa892182d
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
dbms/src/Parsers/ParserShowTablesQuery.cpp
View File

@ -28,6 +28,9 @@ bool ParserShowTablesQuery::parseImpl(Pos & pos, Pos end, ASTPtr & node, String
ASTPtr like;
ASTPtr database;
ASTPtr format;
ASTShowTablesQuery * query = new ASTShowTablesQuery;
ASTPtr query_ptr = query;
ws.ignore(pos, end);
@ -38,36 +41,34 @@ bool ParserShowTablesQuery::parseImpl(Pos & pos, Pos end, ASTPtr & node, String
if (s_databases.ignore(pos, end))
{
ASTShowTablesQuery * query = new ASTShowTablesQuery(StringRange(begin, pos));
query->databases = true;
node = query;
return true;
}
if (!s_tables.ignore(pos, end, expected))
return false;
ws.ignore(pos, end);
if (s_from.ignore(pos, end, expected))
else
{
if (!s_tables.ignore(pos, end, expected))
return false;
ws.ignore(pos, end);
if (!name_p.parse(pos, end, database, expected))
return false;
}
if (s_from.ignore(pos, end, expected))
{
ws.ignore(pos, end);
ws.ignore(pos, end);
if (!name_p.parse(pos, end, database, expected))
return false;
}
if (s_like.ignore(pos, end, expected))
{
ws.ignore(pos, end);
if (!like_p.parse(pos, end, like, expected))
return false;
}
if (s_like.ignore(pos, end, expected))
{
ws.ignore(pos, end);
if (!like_p.parse(pos, end, like, expected))
return false;
}
}
ws.ignore(pos, end);
if (s_format.ignore(pos, end, expected))
@ -83,9 +84,8 @@ bool ParserShowTablesQuery::parseImpl(Pos & pos, Pos end, ASTPtr & node, String
ws.ignore(pos, end);
}
ASTShowTablesQuery * query = new ASTShowTablesQuery(StringRange(begin, pos));
node = query;
query->range = StringRange(begin, pos);
if (database)
query->from = dynamic_cast<ASTIdentifier &>(*database).name;
if (like)
@ -95,6 +95,8 @@ bool ParserShowTablesQuery::parseImpl(Pos & pos, Pos end, ASTPtr & node, String
query->format = format;
query->children.push_back(format);
}
node = query_ptr;
return true;
}