Merge a62e654 into f353ec8

JSQLParser · Oct 4, 2021 · bdba786 · bdba786
2 parents f353ec8 + a62e654
commit bdba786
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -1642,6 +1642,10 @@ String RelObjectNameWithoutValue() :
       | tk=<K_LOG> | tk=<K_DUMP> | tk=<K_FLUSH> | tk=<K_ACTIVE> | tk=<K_RESUME> | tk=<K_SWITCH> | tk=<K_SUSPEND>
       | tk=<K_ARCHIVE> | tk=<K_QUIESCE> | tk=<K_HISTORY> | tk=<K_SHUTDOWN> | tk=<K_REGISTER> | tk=<K_UNQIESCE>
       | tk=<K_RESTRICTED> | tk=<K_CHECKPOINT> | tk=<K_DISCONNECT>
+      | tk=<K_SYSTEM>
+      | tk=<K_QUERY>
+
+      | tk=<K_FULLTEXT>
       )
 
     { return tk.image; }

diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
@@ -4822,4 +4822,14 @@ public void testReservedKeywordsMSSQLUseIndexIssue1325() throws JSQLParserExcept
         assertSqlCanBeParsedAndDeparsed(
                 "SELECT col FROM table USE INDEX(primary)", true);
     }
+
+    @Test
+    public void testReservedKeywordsIssue1352() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed(
+                "SELECT system from b1.system", true);
+        assertSqlCanBeParsedAndDeparsed(
+                "SELECT query from query.query", true);
+        assertSqlCanBeParsedAndDeparsed(
+                "SELECT fulltext from fulltext.fulltext", true);
+    }
 }