MXS-1196: Turn certain keywords into ids

2017-05-24 15:22:28 +03:00
parent 77f05b49d0
commit 8b6fc49dc1
2 changed files with 31 additions and 5 deletions
--- a/query_classifier/qc_sqlite/sqlite-src-3110100/src/tokenize.c
+++ b/query_classifier/qc_sqlite/sqlite-src-3110100/src/tokenize.c
@ -569,11 +569,17 @@ int sqlite3GetToken(const unsigned char *z, int *tokenType){

        if (*tokenType != TK_ID) {
          extern int maxscaleKeyword(int);
-          if (maxscaleKeyword(*tokenType) != 0)
-          {
-            /* Consume the entire string. */
-            while ( z[i] ) {
-              ++i;
+          extern int maxscaleTranslateKeyword(int);
+
+          *tokenType = maxscaleTranslateKeyword(*tokenType);
+
+          if (*tokenType != TK_ID) {
+            if (maxscaleKeyword(*tokenType) != 0)
+            {
+              /* Consume the entire string. */
+              while ( z[i] ) {
+                ++i;
+              }
            }
          }
        }