Fixed javaCC for set roles statements and getting correct table name

Author: chernser

jdbc-v2/src/main/java/com/clickhouse/jdbc/DriverProperties.java

@@ -66,7 +66,8 @@ public enum DriverProperties {
      *     <li>JAVACC - parser extracts required information but PreparedStatement parameters parsed separately.</li>
      * </ul>
      */
-    SQL_PARSER("jdbc_sql_parser", "JAVACC", List.of("ANTLR4", "ANTLR4_PARAMS_PARSER", "JAVACC")),
+//    SQL_PARSER("jdbc_sql_parser", "JAVACC", List.of("ANTLR4", "ANTLR4_PARAMS_PARSER", "JAVACC")),
+    SQL_PARSER("jdbc_sql_parser", "ANTLR4", List.of("ANTLR4", "ANTLR4_PARAMS_PARSER", "JAVACC")),
     ;
 
 

jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/SqlParserFacade.java

@@ -42,7 +42,25 @@ public ParsedStatement parsedStatement(String sql) {
             if (parsedStmt.getStatementType() == StatementType.USE) {
                 stmt.setUseDatabase(parsedStmt.getDatabase());
             }
-            // TODO: set roles
+
+            String rolesCount = parsedStmt.getSettings().get("_ROLES_COUNT");
+            if (rolesCount != null) {
+                int rolesCountInt = Integer.parseInt(rolesCount);
+                ArrayList<String> roles = new ArrayList<>(rolesCountInt);
+                boolean resetRoles = false;
+                for (int i = 0; i < rolesCountInt; i++) {
+                    String role = parsedStmt.getSettings().get("_ROLE_" + i);
+                    if (role.equalsIgnoreCase("NONE")) {
+                        resetRoles = true;
+                    }
+                    roles.add(parsedStmt.getSettings().get("_ROLE_" + i));
+                }
+                if (resetRoles) {
+                    roles.clear();
+                }
+                stmt.setRoles(roles);
+            }
+
             stmt.setInsert(parsedStmt.getStatementType() == StatementType.INSERT);
             stmt.setHasErrors(parsedStmt.getStatementType() == StatementType.UNKNOWN);
             stmt.setHasResultSet(isStmtWithResultSet(parsedStmt));
@@ -66,7 +84,11 @@ public ParsedPreparedStatement parsePreparedStatement(String sql) {
             stmt.setInsert(parsedStmt.getStatementType() == StatementType.INSERT);
             stmt.setHasErrors(parsedStmt.getStatementType() == StatementType.UNKNOWN);
             stmt.setHasResultSet(isStmtWithResultSet(parsedStmt));
-            stmt.setTable(parsedStmt.getTable());
+            String tableName = parsedStmt.getTable();
+            if (parsedStmt.getDatabase() != null && parsedStmt.getTable() != null) {
+                tableName = String.format("%s.%s", parsedStmt.getDatabase(), parsedStmt.getTable());
+            }
+            stmt.setTable(tableName);
             stmt.setInsertWithSelect(parsedStmt.containsKeyword("SELECT") && (parsedStmt.getStatementType() == StatementType.INSERT));
             stmt.setAssignValuesGroups(parsedStmt.getValueGroups());
 

jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/parser/javacc/ClickHouseSqlStatement.java

@@ -27,6 +27,9 @@ public class ClickHouseSqlStatement {
     public static final String KEYWORD_VALUES_START = "ValuesStart";
     public static final String KEYWORD_VALUES_END = "ValuesEnd";
 
+    public static final String ROLES_COUNT_SETTINGS_KEY = "_ROLES_COUNT";
+    public static final String ROLES_PREFIX_SETTINGS_KEY = "_ROLE_";
+
     private final String sql;
     private final StatementType stmtType;
     private final String cluster;