From 19cc3e67e149b86b11bb98a847df3ed3fb3393b0 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Thu, 7 Sep 2017 10:03:00 +0300 Subject: [PATCH] MXS-1395 Allow NAMES to be used as keyword/id NAMES is a keyword but not a reserved one. So it must be possible to use it as an identifier as well. --- query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y | 1 + query_classifier/test/maxscale.test | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y b/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y index 1f24bbfde..62a95357b 100644 --- a/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y +++ b/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y @@ -604,6 +604,7 @@ columnid(A) ::= nm(X). { /*KEY*/ /*LIKE_KW*/ MASTER /*MATCH*/ MERGE + NAMES NO OF OFFSET OPEN QUICK diff --git a/query_classifier/test/maxscale.test b/query_classifier/test/maxscale.test index 960149b62..64f5050bc 100644 --- a/query_classifier/test/maxscale.test +++ b/query_classifier/test/maxscale.test @@ -80,4 +80,7 @@ RELEASE SAVEPOINT id; SELECT her FROM (SELECT @@server_id as her) as t WHERE her REGEXP '.*'; -select * from db1.t1 union select * from db2.t2 +select * from db1.t1 union select * from db2.t2; + +# Names is a keyword as well +select names from t; \ No newline at end of file