thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a bunch of aliases to DATE_DIFF interval names

Browse Source
This commit is contained in:
Ivan Blinkov 2018-12-18 18:28:13 +03:00
parent 5abfcfcd48
commit a378b919af
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -711,22 +711,21 @@ bool ParserDateDiffExpression::parseImpl(Pos & pos, ASTPtr & node, Expected & ex
return false; return false;
++pos; ++pos;
if (ParserKeyword("SECOND").ignore(pos, expected) || ParserKeyword("SS").ignore(pos, expected) || ParserKeyword("S").ignore(pos, expected))
if (ParserKeyword("SECOND").ignore(pos, expected))
interval_name = "second"; interval_name = "second";
else if (ParserKeyword("MINUTE").ignore(pos, expected)) else if (ParserKeyword("MINUTE").ignore(pos, expected) || ParserKeyword("MI").ignore(pos, expected) || ParserKeyword("N").ignore(pos, expected))
interval_name = "minute"; interval_name = "minute";
else if (ParserKeyword("HOUR").ignore(pos, expected)) else if (ParserKeyword("HOUR").ignore(pos, expected) || ParserKeyword("HH").ignore(pos, expected))
interval_name = "hour"; interval_name = "hour";
else if (ParserKeyword("DAY").ignore(pos, expected)) else if (ParserKeyword("DAY").ignore(pos, expected) || ParserKeyword("DD").ignore(pos, expected) || ParserKeyword("D").ignore(pos, expected))
interval_name = "day"; interval_name = "day";
else if (ParserKeyword("WEEK").ignore(pos, expected)) else if (ParserKeyword("WEEK").ignore(pos, expected) || ParserKeyword("WK").ignore(pos, expected) || ParserKeyword("WW").ignore(pos, expected))
interval_name = "week"; interval_name = "week";
else if (ParserKeyword("MONTH").ignore(pos, expected)) else if (ParserKeyword("MONTH").ignore(pos, expected) || ParserKeyword("MM").ignore(pos, expected) || ParserKeyword("M").ignore(pos, expected))
interval_name = "month"; interval_name = "month";
else if (ParserKeyword("QUARTER").ignore(pos, expected)) else if (ParserKeyword("QUARTER").ignore(pos, expected) || ParserKeyword("QQ").ignore(pos, expected) || ParserKeyword("Q").ignore(pos, expected))
interval_name = "quarter"; interval_name = "quarter";
else if (ParserKeyword("YEAR").ignore(pos, expected)) else if (ParserKeyword("YEAR").ignore(pos, expected) || ParserKeyword("YYYY").ignore(pos, expected) || ParserKeyword("YY").ignore(pos, expected))
interval_name = "year"; interval_name = "year";
else else
return false; return false;

1
dbms/tests/queries/0_stateless/00765_sql_compatibility_aliases.reference
View File

@ -22,3 +22,4 @@ fooabba
fooabbafoo fooabbafoo
foo* foo*
-11 -11
-3

1
dbms/tests/queries/0_stateless/00765_sql_compatibility_aliases.sql
View File

@ -24,3 +24,4 @@ select Trim(LEADING 'ab' FROM 'abbafooabba');
select TRIM(both 'ab' FROM 'abbafooabbafooabba'); select TRIM(both 'ab' FROM 'abbafooabbafooabba');
select trim(LEADING '*[]{}|\\' FROM '\\|[[[}}}*foo*'); select trim(LEADING '*[]{}|\\' FROM '\\|[[[}}}*foo*');
select DATE_DIFF(MONTH, toDate('2018-12-18'), toDate('2018-01-01')); select DATE_DIFF(MONTH, toDate('2018-12-18'), toDate('2018-01-01'));
select DATE_DIFF(QQ, toDate('2018-12-18'), toDate('2018-01-01'));