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

dbms: fixed error [#METR-11966].

Browse Source
This commit is contained in:
Alexey Milovidov 2014-07-18 23:47:28 +04:00
parent bb90e6d27c
commit aadd791880
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,8 @@ bool ParserArray::parseImpl(Pos & pos, Pos end, ASTPtr & node, Expected & expect
return false; return false;
ws.ignore(pos, end); ws.ignore(pos, end);
contents.parse(pos, end, contents_node, expected); if (!contents.parse(pos, end, contents_node, expected))
return false;
ws.ignore(pos, end); ws.ignore(pos, end);
if (!close.ignore(pos, end, expected)) if (!close.ignore(pos, end, expected))
@ -64,7 +65,8 @@ bool ParserParenthesisExpression::parseImpl(Pos & pos, Pos end, ASTPtr & node, E
return false; return false;
ws.ignore(pos, end); ws.ignore(pos, end);
contents.parse(pos, end, contents_node, expected); if (!contents.parse(pos, end, contents_node, expected))
return false;
ws.ignore(pos, end); ws.ignore(pos, end);
if (!close.ignore(pos, end, expected)) if (!close.ignore(pos, end, expected))
@ -108,7 +110,8 @@ bool ParserSubquery::parseImpl(Pos & pos, Pos end, ASTPtr & node, Expected & exp
return false; return false;
ws.ignore(pos, end); ws.ignore(pos, end);
select.parse(pos, end, select_node, expected); if (!select.parse(pos, end, select_node, expected))
return false;
ws.ignore(pos, end); ws.ignore(pos, end);
if (!close.ignore(pos, end, expected)) if (!close.ignore(pos, end, expected))
@ -222,7 +225,8 @@ bool ParserFunction::parseImpl(Pos & pos, Pos end, ASTPtr & node, Expected & exp
ws.ignore(pos, end); ws.ignore(pos, end);
Pos contents_begin = pos; Pos contents_begin = pos;
contents.parse(pos, end, expr_list_args, expected); if (!contents.parse(pos, end, expr_list_args, expected))
return false;
Pos contents_end = pos; Pos contents_end = pos;
ws.ignore(pos, end); ws.ignore(pos, end);
@ -259,7 +263,8 @@ bool ParserFunction::parseImpl(Pos & pos, Pos end, ASTPtr & node, Expected & exp
expr_list_args = nullptr; expr_list_args = nullptr;
ws.ignore(pos, end); ws.ignore(pos, end);
contents.parse(pos, end, expr_list_args, expected); if (!contents.parse(pos, end, expr_list_args, expected))
return false;
ws.ignore(pos, end); ws.ignore(pos, end);
if (!close.ignore(pos, end, expected)) if (!close.ignore(pos, end, expected))

6
dbms/src/Parsers/ExpressionListParsers.cpp
View File

@ -84,6 +84,7 @@ bool ParserList::parseImpl(Pos & pos, Pos end, ASTPtr & node, Expected & expecte
break; break;
list->children.push_back(elem); list->children.push_back(elem);
first = false;
} }
else else
{ {
@ -98,8 +99,6 @@ bool ParserList::parseImpl(Pos & pos, Pos end, ASTPtr & node, Expected & expecte
list->children.push_back(elem); list->children.push_back(elem);
} }
first = false;
} }
if (!allow_empty && first) if (!allow_empty && first)
@ -123,6 +122,7 @@ bool ParserLeftAssociativeBinaryOperatorList::parseImpl(Pos & pos, Pos end, ASTP
return false; return false;
node = elem; node = elem;
first = false;
} }
else else
{ {
@ -184,8 +184,6 @@ bool ParserLeftAssociativeBinaryOperatorList::parseImpl(Pos & pos, Pos end, ASTP
node = function_node; node = function_node;
} }
first = false;
} }
return true; return true;