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

Fixed tests

Browse Source
This commit is contained in:
Maksim Kita 2022-04-13 16:36:06 +02:00
parent 00ac3231b2
commit 90e3a75874
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Parsers/ExpressionElementParsers.cpp
View File

@ -298,28 +298,46 @@ namespace
{
bool parseCastAs(IParser::Pos & pos, ASTPtr & node, Expected & expected)
{
/// expr AS type
/** Possible variants for cast operator
* First try to match with cast(expr AS Type);
* Then try to match with cast(expr [[as] alias_1], alias_expr [[as] alias_2]);
*
* We need to check if after keyword AS there is identifier followed by comma,
* if it is then it is not cast(expr AS Type)
*/
ASTPtr expr_node;
ASTPtr type_node;
ASTPtr identifier_node;
if (ParserExpressionWithOptionalAlias(true /*allow_alias_without_as_keyword*/).parse(pos, expr_node, expected))
if (ParserExpression().parse(pos, expr_node, expected))
{
if (ParserKeyword("AS").ignore(pos, expected))
bool parse_as = ParserKeyword("AS").ignore(pos, expected);
if (parse_as)
{
if (ParserDataType().parse(pos, type_node, expected))
auto begin = pos;
auto expected_copy = expected;
bool next_identifier_with_comma
= ParserIdentifier().ignore(begin, expected_copy) && ParserToken(TokenType::Comma).ignore(begin, expected_copy);
if (!next_identifier_with_comma && ParserDataType().parse(pos, type_node, expected))
{
node = createFunctionCast(expr_node, type_node);
return true;
}
}
else if (ParserToken(TokenType::Comma).ignore(pos, expected))
if (ParserIdentifier().parse(pos, identifier_node, expected))
expr_node->setAlias(getIdentifierName(identifier_node));
else if (parse_as)
return false;
if (ParserToken(TokenType::Comma).ignore(pos, expected)
&& ParserExpressionWithOptionalAlias(true /*allow_alias_without_as_keyword*/).parse(pos, type_node, expected))
{
if (ParserExpressionWithOptionalAlias(true /*allow_alias_without_as_keyword*/).parse(pos, type_node, expected))
{
node = makeASTFunction("CAST", expr_node, type_node);
return true;
}
node = makeASTFunction("CAST", expr_node, type_node);
return true;
}
}

1
tests/queries/0_stateless/02267_special_operator_parse_alias_check.reference
View File

@ -1,7 +1,6 @@
1234 1234 UInt32
1234 1234 UInt32
1234 1234
1234 1234
234 1234 2 3
234 1234 2 3
234 1234 2

5
tests/queries/0_stateless/02267_special_operator_parse_alias_check.sql
View File

@ -2,8 +2,9 @@
SELECT cast('1234' AS lhs, 'UInt32' AS rhs), lhs, rhs;
SELECT cast('1234' lhs, 'UInt32' rhs), lhs, rhs;
SELECT cast('1234' lhs AS UInt32), lhs;
SELECT cast('1234' AS lhs AS UInt32), lhs;
SELECT cast(('1234' AS lhs) AS UInt32), lhs;
SELECT cast('1234' AS lhs AS UInt32), lhs; --{clientError 62}
SELECT cast('1234' lhs AS UInt32), lhs; --{clientError 62}
-- SUBSTRING expression