fix: GRANT to PUBLIC (allow keyword)

- fixes #2230

Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>

Author: manticore-projects

src/main/java/net/sf/jsqlparser/statement/grant/Grant.java

@@ -24,7 +24,7 @@ public class Grant implements Statement {
 
     private String role;
     private List<String> privileges;
-    private List<String> objectName = new ArrayList<>();
+    private final List<String> objectName = new ArrayList<>();
     private List<String> users;
 
     @Override

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -8831,23 +8831,21 @@ Grant Grant():
 	(
 	    (
             [readGrantTypes(privileges) (<K_COMMA> readGrantTypes(privileges))*]
-            <K_ON>
-                (
-                    objName=RelObjectNames()   { grant.setObjectName(objName.getNames()); }
-                )
-            )
-            |
-            (
-                tk=<S_IDENTIFIER> { grant.setRole(tk.image); }
-            )
+            <K_ON> objName=RelObjectNames()   { grant.setObjectName(objName.getNames()); }
+        )
+        |
+        (
+            tk=<S_IDENTIFIER> { grant.setRole(tk.image); }
         )
-	<K_TO> (users = UsersList() {grant.setUsers(users);})
+    )
+	<K_TO> users = UsersList()
 	{
-            if(privileges.size() > 0) {
-                grant.setPrivileges(privileges);
-            }
-		return grant;
-	}
+        grant.setUsers(users);
+        if(privileges.size() > 0) {
+            grant.setPrivileges(privileges);
+        }
+	    return grant;
+    }
 }
 
 List<String> UsersList():
@@ -8856,7 +8854,7 @@ List<String> UsersList():
     String user = null;
 }
 {
-         user=RelObjectName() { users.add(user); }
+         user=RelObjectNameExt() { users.add(user); }
          ( "," user=ColumnsNamesListItem() { users.add(user); } )*
     {
         return users;

src/test/java/net/sf/jsqlparser/statement/grant/GrantTest.java

@@ -13,6 +13,7 @@
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.parser.CCJSqlParserManager;
 import static net.sf.jsqlparser.test.TestUtils.*;
+import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
 
@@ -97,4 +98,10 @@ public void testGrantQueryWithRole() throws JSQLParserException {
     public void testGrantSchemaParsingIssue1080() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("GRANT SELECT ON schema_name.table_name TO XYZ");
     }
+
+    @Test
+    void testPublicKeywordIssue2230() throws JSQLParserException {
+        String sqlStr = "grant select on da380_now to public;";
+        assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+    }
 }