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

dbms: fixed error with position of FINAL and SAMPLE in SELECT query [#METR-13129].

Browse Source
This commit is contained in:
Alexey Milovidov 2014-10-10 02:46:28 +04:00
parent c1601502bd
commit 110422dc21
1 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
dbms/src/Parsers/ParserSelectQuery.cpp
View File

@ -125,6 +125,40 @@ bool ParserSelectQuery::parseImpl(Pos & pos, Pos end, ASTPtr & node, Expected &
return false; return false;
} }
/** FINAL и SAMPLE может быть здесь или после всех JOIN-ов
* (второй вариант был изначально сделан по ошибке, и его приходится поддерживать).
*/
auto parse_final_and_sample = [&]() -> bool
{
/// FINAL
if (!select_query->final
&& s_final.ignore(pos, end, expected))
{
select_query->final = true;
ws.ignore(pos, end);
}
/// SAMPLE number
if (!select_query->sample_size
&& s_sample.ignore(pos, end, expected))
{
ws.ignore(pos, end);
ParserNumber num;
if (!num.parse(pos, end, select_query->sample_size, expected))
return false;
ws.ignore(pos, end);
}
return true;
};
if (!parse_final_and_sample())
return false;
/// ARRAY JOIN expr list /// ARRAY JOIN expr list
if (s_array.ignore(pos, end, expected)) if (s_array.ignore(pos, end, expected))
{ {
@ -144,26 +178,8 @@ bool ParserSelectQuery::parseImpl(Pos & pos, Pos end, ASTPtr & node, Expected &
/// [GLOBAL] ANY|ALL INNER|LEFT JOIN (subquery) USING (tuple) /// [GLOBAL] ANY|ALL INNER|LEFT JOIN (subquery) USING (tuple)
join.parse(pos, end, select_query->join, expected); join.parse(pos, end, select_query->join, expected);
/// FINAL if (!parse_final_and_sample())
if (s_final.ignore(pos, end, expected)) return false;
{
select_query->final = true;
ws.ignore(pos, end);
}
/// SAMPLE number
if (s_sample.ignore(pos, end, expected))
{
ws.ignore(pos, end);
ParserNumber num;
if (!num.parse(pos, end, select_query->sample_size, expected))
return false;
ws.ignore(pos, end);
}
/// PREWHERE expr /// PREWHERE expr
if (s_prewhere.ignore(pos, end, expected)) if (s_prewhere.ignore(pos, end, expected))