Merge origin/master

JSQLParser · Feb 1, 2020 · 60d9838 · 60d9838
2 parents 39e920d + 430b3ee
commit 60d9838
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -1150,8 +1150,8 @@ Normal names.
 String RelObjectName() :
 {    Token tk = null; String result = null; }
 {
-    (result = RelObjectNameWithoutValue() | tk=<K_TOP> | tk=<K_VALUE> | tk=<K_VALUES> 
-        | tk=<K_INTERVAL> | tk=<K_START> | tk=<K_ON> | tk=<K_ORDER>)
+    (result = RelObjectNameWithoutValue() 
+		| tk=<K_GROUP> | tk=<K_INTERVAL> | tk=<K_ON> | tk=<K_ORDER> | tk=<K_START> | tk=<K_TOP> | tk=<K_VALUE> | tk=<K_VALUES> )
 
     { 
 		if (tk!=null) result=tk.image;
@@ -1196,7 +1196,7 @@ String RelObjectNameExt2():
   String result=null;
 } 
 {
-    ( result=RelObjectNameExt() | tk=<K_FROM> | tk=<K_GROUP> )
+    ( result=RelObjectNameExt() | tk=<K_FROM> )
     {
         if (tk!=null) result=tk.image;
         return result;

diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
@@ -4008,6 +4008,12 @@ public void testOrderKeywordIssue932() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT tmp3.order FROM tmp3");
     }
 
+    @Test
+    public void testOrderKeywordIssue932_2() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT group FROM tmp3");
+        assertSqlCanBeParsedAndDeparsed("SELECT tmp3.group FROM tmp3");
+    }
+
     @Test
     public void testTableFunctionInExprIssue923() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytable WHERE func(a) IN func(b)");

diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SpecialOracleTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SpecialOracleTest.java
@@ -238,7 +238,7 @@ public void testAllSqlsParseDeparse() throws IOException {
 
         LOG.
                 log(Level.INFO, "tested {0} files. got {1} correct parse results", new Object[]{count, success});
-        assertTrue(success >= 162);
+        assertTrue(success >= 164);
     }
 
     @Test