fixed detecting different insert types

Author: chernser

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

@@ -387,7 +387,8 @@ public PreparedStatement prepareStatement(String sql, int resultSetType, int res
              * - INSERT INTO t VALUES (now(), ?, 1), (now(), ?, 2) !# multiple values list
              * - INSERT INTO t SELECT ?, ?, ? !# insert from select
              */
-            if (!parsedStatement.isInsertWithSelect()) {
+            if (!parsedStatement.isInsertWithSelect() && parsedStatement.getAssignValuesGroups() == 1
+                    && !parsedStatement.isUseFunction()) {
                 TableSchema tableSchema = client.getTableSchema(parsedStatement.getTable(), schema);
                 return new WriterStatementImpl(this, sql, tableSchema, parsedStatement);
             }

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

@@ -92,7 +92,7 @@ public PreparedStatementImpl(ConnectionImpl connection, String sql, ParsedPrepar
 
         int valueListStartPos = parsedStatement.getAssignValuesListStartPosition();
         int valueListStopPos = parsedStatement.getAssignValuesListStopPosition();
-        if (valueListStartPos > -1 && valueListStopPos > -1) {
+        if (parsedStatement.getAssignValuesGroups() == 1 && valueListStartPos > -1 && valueListStopPos > -1) {
             int[] positions = parsedStatement.getParamPositions();
             paramPositionsInDataClause = new int[argCount];
             for (int i = 0; i < argCount; i++) {

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

@@ -22,7 +22,7 @@ public class ParsedPreparedStatement extends ClickHouseParserBaseListener {
 
     private String[] insertColumns;
 
-    private boolean hasFuncWrappedParameter;
+    private boolean useFunction;
 
     private boolean hasErrors;
 
@@ -42,6 +42,8 @@ public class ParsedPreparedStatement extends ClickHouseParserBaseListener {
 
     private int assignValuesListStopPosition = -1;
 
+    private int assignValuesGroups = -1;
+
     public void setHasResultSet(boolean hasResultSet) {
         this.hasResultSet = hasResultSet;
     }
@@ -110,6 +112,22 @@ public String getUseDatabase() {
         return useDatabase;
     }
 
+    public void setAssignValuesGroups(int assignValuesGroups) {
+        this.assignValuesGroups = assignValuesGroups;
+    }
+
+    public int getAssignValuesGroups() {
+        return assignValuesGroups;
+    }
+
+    public boolean isUseFunction() {
+        return useFunction;
+    }
+
+    public void setUseFunction(boolean useFunction) {
+        this.useFunction = useFunction;
+    }
+
     @Override
     public void enterQueryStmt(ClickHouseParser.QueryStmtContext ctx) {
         ClickHouseParser.QueryContext qCtx = ctx.query();
@@ -153,7 +171,7 @@ public void visitErrorNode(ErrorNode node) {
 
     @Override
     public void enterInsertParameterFuncExpr(ClickHouseParser.InsertParameterFuncExprContext ctx) {
-        hasFuncWrappedParameter = true;
+        useFunction = true;
     }
 
     @Override
@@ -201,4 +219,14 @@ public void enterInsertStmt(ClickHouseParser.InsertStmtContext ctx) {
     public void enterDataClauseSelect(ClickHouseParser.DataClauseSelectContext ctx) {
         setInsertWithSelect(true);
     }
+
+    @Override
+    public void enterDataClauseValues(ClickHouseParser.DataClauseValuesContext ctx) {
+        setAssignValuesGroups(ctx.assignmentValues().size());
+    }
+
+    @Override
+    public void exitInsertParameterFuncExpr(ClickHouseParser.InsertParameterFuncExprContext ctx) {
+        setUseFunction(true);
+    }
 }

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

@@ -142,6 +142,7 @@ public void testPreparedStatementInsertSQL() {
         assertTrue(parsed.isInsert());
         assertFalse(parsed.isHasResultSet());
         assertFalse(parsed.isInsertWithSelect());
+        assertEquals(parsed.getAssignValuesGroups(), 3);
 
         sql = "-- line comment1 ?\n"
                 + "# line comment2 ?\n"
@@ -153,6 +154,7 @@ public void testPreparedStatementInsertSQL() {
         assertTrue(parsed.isInsert());
         assertFalse(parsed.isHasResultSet());
         assertFalse(parsed.isInsertWithSelect());
+        assertEquals(parsed.getAssignValuesGroups(), 1);
 
         sql = "INSERT INTO tt SELECT now(), 10, 20.0, 30";
         parsed = parser.parsePreparedStatement(sql);
@@ -169,5 +171,6 @@ public void testPreparedStatementInsertSQL() {
         assertTrue(parsed.isInsert());
         assertFalse(parsed.isHasResultSet());
         assertFalse(parsed.isInsertWithSelect());
+        assertEquals(parsed.getAssignValuesGroups(), 1);
     }
 }