Merge branch '2.2' into 2.3

2019-01-09 09:13:59 +02:00
parent 7a7545f8f7 27b3ab28e0
commit 78ea12b4c1
3 changed files with 6 additions and 2 deletions
--- a/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y
+++ b/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y
@ -2122,10 +2122,10 @@ expr(A) ::= expr(X) BITAND|BITOR|LSHIFT|RSHIFT(OP) expr(Y).
 expr(A) ::= expr(X) PLUS|MINUS(OP) expr(Y).
                                        {spanBinaryExpr(&A,pParse,@OP,&X,&Y);}
 %ifdef MAXSCALE
-expr(A) ::= INTERVAL INTEGER(X) id. {
+expr(A) ::= INTERVAL expr(X) id. {
  // Here we could check that id is one of MICROSECOND, SECOND, MINUTE
  // HOUR, DAY, WEEK, etc.
-  spanExpr(&A, pParse, @X, &X);
+  A=X; // We simply ignore 'INTERVAL'
 }
 %endif
 expr(A) ::= expr(X) STAR|SLASH|REM(OP) expr(Y).