Query parse error

[rnavarro]

I think this is a regression.

I have a query like this:

SELECT af.<col_3>, DATE_FORMAT(MAX(af.<col_1>), '%Y;%m;%e;23;59;59') fiscalEndDate, DATE_FORMAT(DATE_ADD(MAX(af.<col_1>), INTERVAL 1 YEAR), '%Y;%m;%e;23;59;59') fiscalAddDate, MAX(af.<col_1>) fiscalEndDateForSort FROM

af WHERE af.<col_2> = '1' AND af.<col_3> IN (123) GROUP BY af.<col_3>;

MySQL returns this error:

select af.<col_3>, DATE_FORMAT(MAX(af.<col_1>), '%Y;%m;%e;23;59;59') as fiscalEndDate, DATE_FORMAT(DATE_ADD(MAX(af.<col_1>), interval 1 year`), '%Y;%m;%e;23;59;59') as fiscalAddDate,
MAX(af.<col_1>) as fiscalEndDateForSort
from

as af where af. = '1' and af. in (123) group by af. limit 10001;`

The issue is here:
INTERVAL 1 YEAR) --> interval 1 `year`)

I think this issue is happening at the vttablet level?

[demmer]

This could be caused by the recent changes to support the create table DDLs since YEAR is now a keyword.

[bbeaudreault]

I think we need to change IntervalExpr's Unit field to not be a ColIdent. @demmer is correct, that adding YEAR as a keyword caused it to become quoted due to https://github.com/youtube/vitess/blob/master/go/vt/sqlparser/ast.go#L2783. Not sure if there's a reason to make Unit a ColIdent

[bbeaudreault]

Yea, colident seems unnecessary. Here's the docs on that UNIT field: https://dev.mysql.com/doc/refman/5.7/en/date-and-time-functions.html#function_date-add

I think we should just change the Unit to a string