fixes #1080

Author: wumpz

README.md

@@ -67,6 +67,7 @@ Also I would like to know about needed examples or documentation stuff.
 
 ## Extensions in the latest SNAPSHOT version 4.0
 
+* **Grant** allows now multipart names
 * updated JavaCC 7.0.10
 * support for **CREATE OR REPLACE** for create function statements
 * support for JDBCParameter for interval expressions

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

@@ -14,14 +14,15 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import static java.util.stream.Collectors.joining;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 public class Grant implements Statement {
 
     private String role;
     private List<String> privileges;
-    private String objectName;
+    private List<String> objectName = new ArrayList<>();
     private List<String> users;
 
     @Override
@@ -46,11 +47,23 @@ public void setPrivileges(List<String> privileges) {
     }
 
     public String getObjectName() {
+        return objectName.size()==0?null:objectName.stream()
+                .map(part -> part==null?"":part)
+                .collect(joining("."));
+    }
+    
+    public List<String> getObjectNameParts() {
         return objectName;
     }
 
     public void setObjectName(String objectName) {
-        this.objectName = objectName;
+        this.objectName.clear();
+        this.objectName.add(objectName);
+    }
+    
+    public void setObjectName(List<String> objectName) {
+        this.objectName.clear();
+        this.objectName.addAll(objectName);
     }
 
     public List<String> getUsers() {
@@ -102,6 +115,11 @@ public Grant withObjectName(String objectName) {
         this.setObjectName(objectName);
         return this;
     }
+    
+    public Grant withObjectName(List<String> objectName) {
+        this.setObjectName(objectName);
+        return this;
+    }
 
     public Grant withUsers(List<String> users) {
         this.setUsers(users);

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

@@ -4919,6 +4919,7 @@ Grant Grant():
 	ArrayList<String> privileges = new ArrayList<String>();
 	List<String> users;
 	Token tk = null;
+        List<String> objName;
 }
 {
 	<K_GRANT>
@@ -4927,19 +4928,19 @@ Grant Grant():
             [readGrantTypes(privileges) (<K_COMMA> readGrantTypes(privileges))*]
             <K_ON>
                 (
-                    tk=<S_IDENTIFIER> { grant.setObjectName(tk.image); }
+                    objName=RelObjectNameList()   { grant.setObjectName(objName); }
                 )
+            )
+            |
+            (
+                tk=<S_IDENTIFIER> { grant.setRole(tk.image); }
+            )
         )
-        |
-        (
-            tk=<S_IDENTIFIER> { grant.setRole(tk.image); }
-        )
-    )
 	<K_TO> (users = UsersList() {grant.setUsers(users);})
 	{
-        if(privileges.size() > 0) {
-            grant.setPrivileges(privileges);
-        }
+            if(privileges.size() > 0) {
+                grant.setPrivileges(privileges);
+            }
 		return grant;
 	}
 }

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

@@ -94,4 +94,9 @@ public void testGrantQueryWithPrivileges() throws JSQLParserException {
     public void testGrantQueryWithRole() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("GRANT ROLE_1 TO TEST_ROLE_1, TEST_ROLE_2");
     }
+    
+    @Test
+    public void testGrantSchemaParsingIssue1080() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("GRANT SELECT ON schema_name.table_name TO XYZ");
+    }
 }

src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java

@@ -4356,4 +4356,9 @@ public void testExistsKeywordIssue1076() throws JSQLParserException {
     public void testExistsKeywordIssue1076_1() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT mycol, EXISTS (SELECT mycol FROM mytable) mycol2 FROM mytable");
     }
+    
+    @Test
+    public void testFormatKeywordIssue1078() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT FORMAT(date, 'yyyy-MM') AS year_month FROM mine_table");
+    }
 }