Fixed javacc to support single line comments and some new statements

ClickHouse · chernser · Oct 29, 2025 · Sep 10, 2025 · Sep 25, 2025 · Sep 28, 2025
commit fdfc35b02b8ce4a19eae8c1262531037860fd3ff
diff --git a/jdbc-v2/pom.xml b/jdbc-v2/pom.xml
@@ -17,7 +17,7 @@
     <url>https://github.com/ClickHouse/clickhouse-java/tree/main/jdbc-v2</url>
 
     <properties>
-        <javacc-plugin.version>4.1.4</javacc-plugin.version>
+        <javacc-plugin.version>5.0.0</javacc-plugin.version>
         <spec.title>JDBC</spec.title>
         <spec.version>4.2</spec.version>
         <jackson.version>2.17.2</jackson.version>
@@ -197,7 +197,6 @@
                             <javadocFriendlyComments>true</javadocFriendlyComments>
                             <packageName>com.clickhouse.jdbc.internal.parser.javacc</packageName>
                             <sourceDirectory>src/main/javacc</sourceDirectory>
-                            <outputDirectory>src/main/java</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/ParsedPreparedStatement.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/ParsedPreparedStatement.java
@@ -34,7 +34,7 @@ public final class ParsedPreparedStatement {
 
     private int assignValuesListStopPosition = -1;
 
-    private int assignValuesGroups = -1;
+    private int assignValuesGroups = 0;
 
     public void setHasResultSet(boolean hasResultSet) {
         this.hasResultSet = hasResultSet;

diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/SqlParserFacade.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/SqlParserFacade.java
@@ -68,10 +68,10 @@ public ParsedPreparedStatement parsePreparedStatement(String sql) {
             stmt.setHasResultSet(isStmtWithResultSet(parsedStmt));
             stmt.setTable(parsedStmt.getTable());
             stmt.setInsertWithSelect(parsedStmt.containsKeyword("SELECT") && (parsedStmt.getStatementType() == StatementType.INSERT));
+            stmt.setAssignValuesGroups(parsedStmt.getValueGroups());
 
             Integer startIndex = parsedStmt.getPositions().get(ClickHouseSqlStatement.KEYWORD_VALUES_START);
             if (startIndex != null) {
-                stmt.setAssignValuesGroups(1);
                 int endIndex = parsedStmt.getPositions().get(ClickHouseSqlStatement.KEYWORD_VALUES_END);
                 stmt.setAssignValuesListStartPosition(startIndex);
                 stmt.setAssignValuesListStopPosition(endIndex);

diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/parser/javacc/ClickHouseSqlStatement.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/parser/javacc/ClickHouseSqlStatement.java
@@ -41,19 +41,20 @@ public class ClickHouseSqlStatement {
     private final Map<String, Integer> positions;
     private final Map<String, String> settings;
     private final Set<String> tempTables;
+    private final int valueGroups;
 
     public ClickHouseSqlStatement(String sql) {
-        this(sql, StatementType.UNKNOWN, null, null, null, null, null, null, null, null, null, null, null, null);
+        this(sql, StatementType.UNKNOWN, null, null, null, null, null, null, null, null, null, null, null, null, 0);
     }
 
     public ClickHouseSqlStatement(String sql, StatementType stmtType) {
-        this(sql, stmtType, null, null, null, null, null, null, null, null, null, null, null, null);
+        this(sql, stmtType, null, null, null, null, null, null, null, null, null, null, null, null, 0);
     }
 
     public ClickHouseSqlStatement(String sql, StatementType stmtType, String cluster, String database, String table,
             String input, String compressAlgorithm, String compressLevel, String format, String file,
             List<Integer> parameters, Map<String, Integer> positions, Map<String, String> settings,
-            Set<String> tempTables) {
+            Set<String> tempTables, int valueGroups) {
         this.sql = sql;
         this.stmtType = stmtType;
 
@@ -65,6 +66,7 @@ public ClickHouseSqlStatement(String sql, StatementType stmtType, String cluster
         this.compressLevel = compressLevel;
         this.format = format;
         this.file = file;
+        this.valueGroups = valueGroups;
 
         if (parameters != null && !parameters.isEmpty()) {
             this.parameters = Collections.unmodifiableList(parameters);
@@ -297,6 +299,10 @@ public Map<String, Integer> getPositions() {
         return this.positions;
     }
 
+    public int getValueGroups() {
+        return valueGroups;
+    }
+
     public Map<String, String> getSettings() {
         return this.settings;
     }

diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/parser/javacc/JdbcParseHandler.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/parser/javacc/JdbcParseHandler.java
@@ -71,7 +71,7 @@ private ClickHouseSqlStatement handleDelete(String sql, StatementType stmtType,
             builder.append("TRUNCATE TABLE").append(sql.substring(index + 4));
         }
         return new ClickHouseSqlStatement(builder.toString(), stmtType, cluster, database, table, input,
-                compressAlgorithm, compressLevel, format, file, parameters, null, settings, null);
+                compressAlgorithm, compressLevel, format, file, parameters, null, settings, null, 0);
     }
 
     private ClickHouseSqlStatement handleUpdate(String sql, StatementType stmtType, String cluster, String database,
@@ -91,13 +91,13 @@ private ClickHouseSqlStatement handleUpdate(String sql, StatementType stmtType,
         builder.append('`').append(table).append('`').append(" UPDATE"); // .append(sql.substring(index + 3));
         addMutationSetting(sql, builder, positions, settings, index + 3);
         return new ClickHouseSqlStatement(builder.toString(), stmtType, cluster, database, table, input,
-                compressAlgorithm, compressLevel, format, file, parameters, null, settings, null);
+                compressAlgorithm, compressLevel, format, file, parameters, null, settings, null, 0);
     }
 
     private ClickHouseSqlStatement handleInFileForInsertQuery(String sql, StatementType stmtType, String cluster,
-            String database, String table, String input, String compressAlgorithm, String compressLevel, String format,
-            String file, List<Integer> parameters, Map<String, Integer> positions, Map<String, String> settings,
-            Set<String> tempTables) {
+                                                              String database, String table, String input, String compressAlgorithm, String compressLevel, String format,
+                                                              String file, List<Integer> parameters, Map<String, Integer> positions, Map<String, String> settings,
+                                                              Set<String> tempTables, int valueGroups) {
         StringBuilder builder = new StringBuilder(sql.length());
         builder.append(sql.substring(0, positions.get("FROM")));
         Integer index = positions.get("SETTINGS");
@@ -115,7 +115,7 @@ private ClickHouseSqlStatement handleInFileForInsertQuery(String sql, StatementT
             builder.append("FORMAT ").append(format);
         }
         return new ClickHouseSqlStatement(builder.toString(), stmtType, cluster, database, table, input,
-                compressAlgorithm, compressLevel, format, file, parameters, null, settings, null);
+                compressAlgorithm, compressLevel, format, file, parameters, null, settings, null, valueGroups);
     }
 
     private ClickHouseSqlStatement handleOutFileForSelectQuery(String sql, StatementType stmtType, String cluster,
@@ -129,14 +129,14 @@ private ClickHouseSqlStatement handleOutFileForSelectQuery(String sql, Statement
             builder.append(sql.substring(index));
         }
         return new ClickHouseSqlStatement(builder.toString(), stmtType, cluster, database, table, input,
-                compressAlgorithm, compressLevel, format, file, parameters, null, settings, null);
+                compressAlgorithm, compressLevel, format, file, parameters, null, settings, null, 0);
     }
 
     @Override
     public ClickHouseSqlStatement handleStatement(String sql, StatementType stmtType, String cluster, String database,
             String table, String input, String compressAlgorithm, String compressLevel, String format, String file,
             List<Integer> parameters, Map<String, Integer> positions, Map<String, String> settings,
-            Set<String> tempTables) {
+            Set<String> tempTables, int valueGroups) {
         boolean hasFile = allowLocalFile && !ClickHouseChecker.isNullOrEmpty(file) && file.charAt(0) == '\'';
         ClickHouseSqlStatement s = null;
         if (stmtType == StatementType.DELETE) {
@@ -149,7 +149,7 @@ public ClickHouseSqlStatement handleStatement(String sql, StatementType stmtType
                             format, file, parameters, positions, settings, tempTables);
         } else if (stmtType == StatementType.INSERT && hasFile) {
             s = handleInFileForInsertQuery(sql, stmtType, cluster, database, table, input, compressAlgorithm,
-                    compressLevel, format, file, parameters, positions, settings, tempTables);
+                    compressLevel, format, file, parameters, positions, settings, tempTables, valueGroups);
         } else if (stmtType == StatementType.SELECT && hasFile) {
             s = handleOutFileForSelectQuery(sql, stmtType, cluster, database, table, input, compressAlgorithm,
                     compressLevel, format, file, parameters, positions, settings, tempTables);

diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/parser/javacc/ParseHandler.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/parser/javacc/ParseHandler.java
@@ -52,7 +52,7 @@ public String handleParameter(String cluster, String database, String table, int
     public ClickHouseSqlStatement handleStatement(String sql, StatementType stmtType, String cluster, String database,
                                                   String table, String input, String compressAlgorithm, String compressLevel, String format, String file,
                                                   List<Integer> parameters, Map<String, Integer> positions, Map<String, String> settings,
-                                                  Set<String> tempTables) {
+                                                  Set<String> tempTables, int valueGroup) {
         return null;
     }
 }
diff --git a/jdbc-v2/src/main/javacc/ClickHouseSqlParser.jj b/jdbc-v2/src/main/javacc/ClickHouseSqlParser.jj
@@ -174,6 +174,7 @@ TOKEN_MGR_DECLS: {
     String compressLevel = null;
     String format = null;
     String file = null;
+    int valueGroups = 0;
 
     final List<Integer> parameters = new ArrayList<>();
     final Map<String, Integer> positions = new HashMap<>();
@@ -276,12 +277,12 @@ TOKEN_MGR_DECLS: {
 
         if (handler != null) {
             s = handler.handleStatement(
-                sqlStmt, stmtType, cluster, database, table, input, compressAlgorithm, compressLevel, format, file, parameters, positions, settings, tempTables);
+                sqlStmt, stmtType, cluster, database, table, input, compressAlgorithm, compressLevel, format, file, parameters, positions, settings, tempTables, valueGroups);
         }
 
         if (s == null) {
             s = new ClickHouseSqlStatement(
-                sqlStmt, stmtType, cluster, database, table, input, compressAlgorithm, compressLevel, format, file, parameters, positions, settings, tempTables);
+                sqlStmt, stmtType, cluster, database, table, input, compressAlgorithm, compressLevel, format, file, parameters, positions, settings, tempTables, valueGroups);
         }
 
         // reset variables
@@ -323,6 +324,9 @@ TOKEN_MGR_DECLS: {
 
         this.settings.put(key.toLowerCase(Locale.ROOT), value);
     }
+    void incValueGroup() {
+        this.valueGroups++;
+    }
 }
 
 SKIP: {
@@ -366,7 +370,7 @@ SKIP: {
             }
         }
     }
-    | <SINGLE_LINE_COMMENT: ("--" | "//") (~["\r", "\n"])*> { append(image); }
+    | <SINGLE_LINE_COMMENT: ("--" | "//" | "#" | "#!") (~["\r", "\n"])*> { append(image); }
     | "/*" { commentNestingDepth = 1; append(image); }: MULTI_LINE_COMMENT
 }
 
@@ -418,6 +422,7 @@ void stmt(): {} {
     | optimizeStmt() { token_source.stmtType = StatementType.OPTIMIZE; }
     | renameStmt()   { token_source.stmtType = StatementType.RENAME;   }
     | revokeStmt()   { token_source.stmtType = StatementType.REVOKE;   }
+    | <LPAREN> selectStmt() <RPAREN> { token_source.stmtType = StatementType.SELECT; }
     | selectStmt()   { token_source.stmtType = StatementType.SELECT;   }
     | setStmt()      { token_source.stmtType = StatementType.SET;      }
     | showStmt()     { token_source.stmtType = StatementType.SHOW;     }
@@ -569,12 +574,12 @@ void dataClause(): {} {
     try {
         LOOKAHEAD(2) <VALUES> { token_source.addPosition(token); }
             <LPAREN> { token_source.addCustomKeywordPosition(ClickHouseSqlStatement.KEYWORD_VALUES_START, token); }
-            columnExprList()
+            columnExprList() { token_source.incValueGroup(); }
             <RPAREN> { token_source.addCustomKeywordPosition(ClickHouseSqlStatement.KEYWORD_VALUES_END, token); }
             (
                 LOOKAHEAD(2)
                 (<COMMA>)?
-                <LPAREN> { token_source.removePosition(ClickHouseSqlStatement.KEYWORD_VALUES_START); }
+                <LPAREN> { token_source.removePosition(ClickHouseSqlStatement.KEYWORD_VALUES_START); token_source.incValueGroup(); }
                 columnExprList()
                 <RPAREN> { token_source.removePosition(ClickHouseSqlStatement.KEYWORD_VALUES_END); }
             )*
@@ -656,6 +661,7 @@ void showStmt(): {} {
             LOOKAHEAD(2)
             <CREATE>
             (<DATABASE> databaseIdentifier(true))
+            | LOOKAHEAD(2) (LOOKAHEAD(1) <CREATE>)? (LOOKAHEAD(1) <SETTINGS>)? <PROFILE> anyIdentifier()
             | LOOKAHEAD(2) (<DICTIONARY> tableIdentifier(true))
             | LOOKAHEAD(2) ((LOOKAHEAD(2) <TEMPORARY>)? (LOOKAHEAD(2) <TABLE>)? tableIdentifier(true))
         )

diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/BaseSqlParserFacadeTest.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/BaseSqlParserFacadeTest.java
@@ -125,9 +125,14 @@ public static Object[][] testPreparedStatementInsertSQLDP() {
                         + "#! line comment3 ?\n"
                         + "/* block comment ? \n */"
                         + "INSERT INTO `with_complex_id`(`v?``1`, \"v?\"\"2\",`v?\\`3`, \"v?\\\"4\") VALUES (?, ?, ?, ?);", 1, false, 4},
+                {"-- line comment1 ?\n"
+//                        + "# line comment2 ?\n"
+//                        + "#! line comment3 ?\n"
+                        + "/* block comment ? \n */"
+                        + "INSERT INTO `with_complex_id`(`v?``1`, \"v?\"\"2\",`v?\\`3`, \"v?\\\"4\") VALUES (?, ?, ?, ?);", 1, false, 4},
                 { "INSERT INTO `test_stmt_split2` VALUES (1, 'abc'), (2, '?'), (3, '?')", 3, false, 0 },
                 { "INSERT INTO `with_complex_id`(`v?``1`, \"v?\"\"2\",`v?\\`3`, \"v?\\\"4\") VALUES (?, ?, ?, ?);", 1, false, 4},
-                { "INSERT INTO tt SELECT now(), 10, 20.0, 30", -1, true, 0 },
+                { "INSERT INTO tt SELECT now(), 10, 20.0, 30", 0, true, 0 },
                 { "INSERT INTO `users` (`name`, `last_login`, `password`, `id`) VALUES\n" +
                         " (?, `parseDateTimeBestEffort`(?, ?), ?, 1)\n", 1, false, 4 },
         };

diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/JavaCCParserTest.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/JavaCCParserTest.java
@@ -3,7 +3,7 @@
 
 import org.testng.annotations.Ignore;
 
-@Ignore
+//@Ignore
 public class JavaCCParserTest extends BaseSqlParserFacadeTest {
     public JavaCCParserTest() throws Exception {
         super(SqlParserFacade.SQLParser.JAVACC.name());