Merge pull request #2135 from samssh/fix#2132

fix: #2132 fix executing queries with 'WITH' clause in jdbc v2

Author: chernser

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

@@ -84,6 +84,7 @@ protected static StatementType parseStatementType(String sql) {
 
                 switch (tokens[0].toUpperCase()) {
                     case "SELECT": return StatementType.SELECT;
+                    case "WITH": return StatementType.SELECT;
                     case "INSERT": return StatementType.INSERT;
                     case "DELETE": return StatementType.DELETE;
                     case "UPDATE": return StatementType.UPDATE;

jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java

@@ -260,4 +260,20 @@ public void testEscapeStrings() throws Exception {
             }
         }
     }
+
+
+    @Test(groups = "integration")
+    void testWithClause() throws Exception {
+        int count = 0;
+        try (Connection conn = getJdbcConnection()) {
+            try (PreparedStatement stmt = conn.prepareStatement("with data as (SELECT number FROM numbers(100)) select * from data ")) {
+                stmt.execute();
+                ResultSet rs = stmt.getResultSet();
+                while (rs.next()) {
+                    count++;
+                }
+            }
+        }
+        assertEquals(count, 100);
+    }
 }

jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java

@@ -464,6 +464,11 @@ public void testWithComments() throws Exception {
         assertEquals(StatementImpl.parseStatementType("      "), StatementImpl.StatementType.OTHER);
     }
 
+    @Test(groups = { "integration" })
+    public void testParseStatementWithClause() throws Exception {
+        assertEquals(StatementImpl.parseStatementType("with data as (SELECT number FROM numbers(100)) select * from data"), StatementImpl.StatementType.SELECT);
+    }
+
 
     @Test(groups = { "integration" })
     public void testWithIPs() throws Exception {
@@ -539,4 +544,19 @@ public void testTextFormatInResponse() throws Exception {
             Assert.expectThrows(SQLException.class, () ->stmt.executeQuery("SELECT 1 FORMAT JSON"));
         }
     }
+
+    @Test(groups = "integration")
+    void testWithClause() throws Exception {
+        int count = 0;
+        try (Connection conn = getJdbcConnection()) {
+            try (Statement stmt = conn.createStatement()) {
+                stmt.execute("with data as (SELECT number FROM numbers(100)) select * from data");
+                ResultSet rs = stmt.getResultSet();
+                while (rs.next()) {
+                    count++;
+                }
+            }
+        }
+        assertEquals(count, 100);
+    }
 }