fixed GRANT stmts and added REVOKE statements

Author: chernser

jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/parser/ClickHouseLexer.g4

@@ -237,6 +237,7 @@ PROFILE      : P R O F I L E;
 PROFILES      : P R O F I L E S;
 PROJECTION   : P R O J E C T I O N;
 PULLING : P U L L I N G ;
+REVOKE : R E V O K E;
 QUARTER      : Q U A R T E R;
 QUEUE : Q U E U E ;
 QUEUES : Q U E U E S ;

jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/parser/ClickHouseParser.g4

@@ -33,10 +33,13 @@ query
     | showStmt
     | systemStmt
     | truncateStmt // DDL
+    | deleteStmt
+    | updateStmt
     | useStmt
     | watchStmt
     | ctes? selectStmt
     | grantStmt
+    | revokeStmt
     ;
 
 // CTE statement
@@ -59,16 +62,27 @@ cteUnboundCol
     | LPAREN ctes? selectStmt RPAREN AS identifier # CteUnboundNestedSelect
     ;
 
+// DELETE statement
+
+deleteStmt
+    : DELETE FROM tableIdentifier clusterClause?  (IN partitionClause)? whereClause?
+    ;
+
+// UPDATE statement
+updateStmt
+    : UPDATE tableIdentifier clusterClause? SET assignmentExprList whereClause?
+    ;
+
 // ALTER statement
 
 alterStmt
     : ALTER TABLE tableIdentifier clusterClause? alterTableClause (COMMA alterTableClause)* # AlterTableStmt
     ;
 
 alterTableClause
-    : ADD COLUMN (IF NOT EXISTS)? tableColumnDfnt (AFTER nestedIdentifier)?         # AlterTableClauseAddColumn
-    | ADD INDEX (IF NOT EXISTS)? tableIndexDfnt (AFTER nestedIdentifier)?           # AlterTableClauseAddIndex
-    | ADD PROJECTION (IF NOT EXISTS)? tableProjectionDfnt (AFTER nestedIdentifier)? # AlterTableClauseAddProjection
+    : ADD COLUMN (IF NOT EXISTS)? tableColumnDfnt (AFTER (nestedIdentifier | FIRST))?         # AlterTableClauseAddColumn
+    | ADD INDEX (IF NOT EXISTS)? tableIndexDfnt (AFTER (nestedIdentifier | FIRST))?           # AlterTableClauseAddIndex
+    | ADD PROJECTION (IF NOT EXISTS)? tableProjectionDfnt (AFTER (nestedIdentifier | FIRST))? # AlterTableClauseAddProjection
     | ATTACH partitionClause (FROM tableIdentifier)?                                # AlterTableClauseAttach
     | CLEAR COLUMN (IF EXISTS)? nestedIdentifier (IN partitionClause)?              # AlterTableClauseClearColumn
     | CLEAR INDEX (IF EXISTS)? nestedIdentifier (IN partitionClause)?               # AlterTableClauseClearIndex
@@ -87,6 +101,7 @@ alterTableClause
     | MODIFY COLUMN (IF EXISTS)? nestedIdentifier COMMENT STRING_LITERAL            # AlterTableClauseModifyComment
     | MODIFY COLUMN (IF EXISTS)? nestedIdentifier REMOVE tableColumnPropertyType    # AlterTableClauseModifyRemove
     | MODIFY COLUMN (IF EXISTS)? tableColumnDfnt                                    # AlterTableClauseModify
+    | ALTER COLUMN (IF EXISTS)? identifier TYPE columnTypeExpr codecExpr? ttlClause? settingExprList? (AFTER (nestedIdentifier | FIRST))? # AlterTableClauseAlterType
     | MODIFY ORDER BY columnExpr                                                    # AlterTableClauseModifyOrderBy
     | MODIFY ttlClause                                                              # AlterTableClauseModifyTTL
     | MODIFY COMMENT literal                                                        # AlterTableClauseModifyComment
@@ -107,6 +122,7 @@ assignmentExprList
 
 assignmentExpr
     : nestedIdentifier EQ_SINGLE columnExpr
+    | nestedIdentifier EQ_SINGLE QUERY
     ;
 
 tableColumnPropertyType
@@ -608,10 +624,25 @@ setRolesList
     : identifier (COMMA identifier)*
     ;
 
+// GRANT statements
+
 grantStmt
-    : GRANT clusterClause? ((privilege ON grantTableIdentifier) | (identifier (COMMA identifier)*))
+    : GRANT clusterClause? identifier (COMMA identifier)* TO (CURRENT_USER | identifier (COMMA identifier)*)
+              (WITH ADMIN OPTION)? (WITH REPLACE OPTION)?
+    | GRANT clusterClause? privelegeList ON grantTableIdentifier
         TO (CURRENT_USER | identifier) (COMMA identifier)*
         (WITH GRANT OPTION)? (WITH REPLACE OPTION)?
+    | GRANT CURRENT GRANTS (LPAREN ((privelegeList ON grantTableIdentifier) | (identifier (COMMA identifier)*)) RPAREN)?
+        TO (CURRENT_USER | identifier (COMMA identifier)*)
+                (WITH GRANT OPTION)? (WITH REPLACE OPTION)?
+    ;
+
+// REVOKE statements
+revokeStmt
+    : REVOKE clusterClause? privelegeList ON grantTableIdentifier
+        FROM ((CURRENT_USER | identifier) (COMMA identifier)* | ALL | ALL EXCEPT (CURRENT_USER | identifier) (COMMA identifier)* )
+    | REVOKE clusterClause? (ADMIN OPTION FOR)? identifier (COMMA identifier)*
+        FROM ((CURRENT_USER | identifier) (COMMA identifier)* | ALL | ALL EXCEPT (CURRENT_USER | identifier) (COMMA identifier)* )
     ;
 
 grantTableIdentifier
@@ -621,6 +652,15 @@ grantTableIdentifier
     | (ASTERISK DOT)? ASTERISK
     ;
 
+privelegeList
+    : columnPrivilege (COMMA columnPrivilege)*
+    ;
+
+
+columnPrivilege
+    : privilege (LPAREN identifier (COMMA identifier)* RPAREN)?
+    ;
+
 privilege
     :
     | ACCESS MANAGEMENT

jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/SqlParserTest.java

@@ -542,7 +542,7 @@ public static Object[][] testStatementWithoutResultSetDP() {
                 {"CREATE QUOTA qB FOR INTERVAL 30 minute MAX execution_time = 0.5, FOR INTERVAL 5 quarter MAX queries = 321, errors = 10 TO default", 0, false},
                 {"CREATE SETTINGS PROFILE max_memory_usage_profile SETTINGS max_memory_usage = 100000001 MIN 90000000 MAX 110000000 TO robin", 0, false},
                 {"CREATE NAMED COLLECTION foobar AS a = '1', b = '2' OVERRIDABLE", 0, false},
-//                {"alter table t alter column j default 1", 0, false}, // not supported by CH
+                {"alter table t2 alter column v type Int32", 0, false},
                 {"ALTER TABLE t MODIFY COLUMN j default 1", 0, false},
                 {"ALTER TABLE t MODIFY COMMENT 'comment'", 0, false},
                 {"DELETE FROM db.table1 ON CLUSTER `default` WHERE max(a, 10) > ?", 1, false},
@@ -555,10 +555,10 @@ public static Object[][] testStatementWithoutResultSetDP() {
                 {"SYSTEM RELOAD DICTIONARIES ON CLUSTER `default`", 0, false},
                 {"GRANT SELECT ON db.* TO john", 0, false},
                 {"GRANT ON CLUSTER `default` SELECT(a, b) ON db1.tableA TO `user` WITH GRANT OPTION WITH REPLACE OPTION", 0, false},
-                {"GRANT SELECT db.* TO user01 WITH REPLACE OPTION", 0, false},
+                {"GRANT SELECT ON db.* TO user01 WITH REPLACE OPTION", 0, false},
                 {"GRANT ON CLUSTER role1, role2 TO `user01` WITH ADMIN OPTION WITH REPLACE OPTION", 0, false},
                 {"GRANT CURRENT GRANTS TO user01", 0, false},
-                {"REVOKE SELECT(a,b) ON db1.tableA FROM `user01", 0, false},
+                {"REVOKE SELECT(a,b) ON db1.tableA FROM `user01`", 0, false},
                 {"REVOKE SELECT ON db1.* FROM ALL", 0, false},
                 {"REVOKE SELECT ON db1.* FROM ALL EXCEPT `admin01`", 0, false},
                 {"REVOKE SELECT ON db1.* FROM ALL EXCEPT CURRENT USER", 0, false},
@@ -606,6 +606,7 @@ public static Object[][] testStatementWithoutResultSetDP() {
                 {"EXCHANGE DICTIONARIES dict1 AND dict2", 0, false},
                 {"EXCHANGE DICTIONARIES dict1 AND dict2 ON CLUSTER `default`", 0, false},
                 {"SET profile = 'profile-name-from-the-settings-file'", 0, false},
+                {"SET use_some_feature_flag", 0, false},
                 {"SET ROLE role1", 0, false},
                 {"SET DEFAULT ROLE role1 TO user", 0, false},
                 {"SET DEFAULT ROLE NONE TO user", 0, false},