fixed more statement tests

Author: chernser

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

@@ -100,6 +100,7 @@ ENGINES       : E N G I N E S;
 ESTIMATE     : E S T I M A T E;
 EVENTS       : E V E N T S;
 EXCEPT       : E X C E P T;
+EXCHANGE     : E X C H A N G E;
 EXISTS       : E X I S T S;
 EXPLAIN      : E X P L A I N;
 EXPRESSION   : E X P R E S S I O N;
@@ -241,6 +242,7 @@ 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 ;
+QUERY_SQL : Q U E R Y; // conflicts with '?'
 QUOTA : Q U O T A;
 QUOTAS : Q U O T A S ;
 RABBITMQ : R A B B I T M Q;

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

@@ -40,6 +40,7 @@ query
     | ctes? selectStmt
     | grantStmt
     | revokeStmt
+    | exchangeStmt
     ;
 
 // CTE statement
@@ -368,10 +369,12 @@ describeStmt
 // DROP statement
 
 dropStmt
-    : (DETACH | DROP) DATABASE (IF EXISTS)? databaseIdentifier clusterClause? # DropDatabaseStmt
-    | (DETACH | DROP) (DICTIONARY | TEMPORARY? TABLE | VIEW | ROLE | USER) (IF EXISTS)? tableIdentifier clusterClause? (
-        NO DELAY
-    )? # DropTableStmt
+    : (DETACH | DROP) DATABASE (IF EXISTS)? databaseIdentifier clusterClause? SYNC?
+    | (DETACH | DROP) (DICTIONARY | TEMPORARY? TABLE | VIEW) (IF EXISTS)? tableIdentifier clusterClause?
+        (NO DELAY)? SYNC?
+    | (DETACH | DROP) (USER | ROLE | QUOTA | SETTINGS? PROFILE) (IF EXISTS)? identifier clusterClause? (FROM identifier)?
+    | (DETACH | DROP) ROW? POLICY (IF EXISTS)? identifier ON grantTableIdentifier (COMMA grantTableIdentifier)* clusterClause? (FROM identifier)?
+    | (DETACH | DROP) (FUNCTION | NAMED COLLECTION) (IF EXISTS)? identifier clusterClause?
     ;
 
 // EXISTS statement
@@ -419,7 +422,8 @@ assignmentValue
 // KILL statement
 
 killStmt
-    : KILL MUTATION clusterClause? whereClause (SYNC | ASYNC | TEST)? # KillMutationStmt
+    : KILL MUTATION clusterClause? whereClause (SYNC | ASYNC | TEST)? (FORMAT identifier)? # KillMutationStmt
+    | KILL QUERY_SQL clusterClause? whereClause (SYNC | ASYNC | TEST)? (FORMAT identifier)? # KillQueryStmt
     ;
 
 // OPTIMIZE statement
@@ -432,6 +436,7 @@ optimizeStmt
 
 renameStmt
     : RENAME TABLE tableIdentifier TO tableIdentifier (COMMA tableIdentifier TO tableIdentifier)* clusterClause?
+    | RENAME
     ;
 
 // PROJECTION SELECT statement
@@ -608,6 +613,12 @@ winFrameBound
 
 //rangeClause: RANGE LPAREN (MIN identifier MAX identifier | MAX identifier MIN identifier) RPAREN;
 
+// EXCHANGE statement
+exchangeStmt
+    : EXCHANGE (TABLES|DICTIONARIES) tableIdentifier AND tableIdentifier clusterClause?
+    ;
+
+
 // SET statement
 
 setStmt
@@ -627,11 +638,9 @@ setRolesList
 // GRANT statements
 
 grantStmt
-    : GRANT clusterClause? identifier (COMMA identifier)* TO (CURRENT_USER | identifier (COMMA identifier)*)
-              (WITH ADMIN OPTION)? (WITH REPLACE OPTION)?
-    | GRANT clusterClause? privelegeList ON grantTableIdentifier
+    : GRANT clusterClause? ((identifier (COMMA identifier)*) | (privelegeList ON grantTableIdentifier))
         TO (CURRENT_USER | identifier) (COMMA identifier)*
-        (WITH GRANT OPTION)? (WITH REPLACE OPTION)?
+        (WITH ADMIN OPTION)? (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)?
@@ -1250,6 +1259,7 @@ keyword
     | PRECEDING
     | PREWHERE
     | PRIMARY
+    | PROFILE
     | RANGE
     | RELOAD
     | REMOVE

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

@@ -556,7 +556,8 @@ public static Object[][] testStatementWithoutResultSetDP() {
                 {"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 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 ON CLUSTER `default` role1, role2 TO `user01` WITH ADMIN OPTION WITH REPLACE OPTION", 0, false},
+                {"GRANT 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 ON db1.* FROM ALL", 0, false},
@@ -577,7 +578,9 @@ public static Object[][] testStatementWithoutResultSetDP() {
                 {"DROP TABLE `db1`.`table01`", 0, false},
                 {"DROP DICTIONARY `dict1`", 0, false},
                 {"DROP ROLE IF EXISTS `role01`", 0 , false},
-                {"DROP POLICY IF EXISTS `pol1`", 0, false},
+                {"DROP POLICY IF EXISTS `pol1` ON db1.table1 ON CLUSTER `default` FROM `test`", 0, false},
+                {"DROP POLICY IF EXISTS `pol1` ON db1.table1 ON CLUSTER `default`", 0, false},
+                {"DROP POLICY IF EXISTS `pol1` ON table1", 0, false},
                 {"DROP QUOTA IF EXISTS q1", 0, false},
                 {"DROP SETTINGS PROFILE IF EXISTS `profile1` ON CLUSTER `default`", 0, false},
                 {"DROP VIEW view1 ON CLUSTER `default` SYNC", 0, false},
@@ -607,6 +610,7 @@ public static Object[][] testStatementWithoutResultSetDP() {
                 {"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 use_some_feature_flag = 'true'", 0, false},
                 {"SET ROLE role1", 0, false},
                 {"SET DEFAULT ROLE role1 TO user", 0, false},
                 {"SET DEFAULT ROLE NONE TO user", 0, false},