Addded more tests and fixed another variant of WITH statement

Author: chernser

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

@@ -382,6 +382,7 @@ topClause
 
 fromClause
     : FROM joinExpr
+    | FROM identifier LPAREN QUERY RPAREN
     ;
 
 arrayJoinClause

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

@@ -188,6 +188,13 @@ public void enterInsertParameter(ClickHouseParser.InsertParameterContext ctx) {
         appendParameter(ctx.start.getStartIndex());
     }
 
+    @Override
+    public void enterFromClause(ClickHouseParser.FromClauseContext ctx) {
+        if (ctx.QUERY() != null) {
+            appendParameter(ctx.QUERY().getSymbol().getStartIndex());
+        }
+    }
+
     private void appendParameter(int startIndex) {
         argCount++;
         if (argCount > paramPositions.length) {

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

@@ -345,6 +345,81 @@ void testWithClauseWithParams() throws Exception {
         }
     }
 
+    @Test(groups = { "integration" })
+    void testMultipleWithClauses() throws Exception {
+        try (Connection conn = getJdbcConnection();
+             PreparedStatement stmt = conn.prepareStatement(
+                     "WITH data1 AS (SELECT 1 AS a), " +
+                             "     data2 AS (SELECT a + 1 AS b FROM data1) " +
+                             "SELECT * FROM data2")) {
+            ResultSet rs = stmt.executeQuery();
+            assertTrue(rs.next());
+            assertEquals(2, rs.getInt(1));
+            assertFalse(rs.next());
+        }
+    }
+
+    @Test(groups = { "integration" })
+    void testRecursiveWithClause() throws Exception {
+        try (Connection conn = getJdbcConnection();
+             PreparedStatement stmt = conn.prepareStatement(
+                     "WITH RECURSIVE numbers AS (" +
+                             "    SELECT 1 AS n " +
+                             "    UNION ALL " +
+                             "    SELECT n + 1 FROM numbers WHERE n < 5" +
+                             ") " +
+                             "SELECT * FROM numbers ORDER BY n")) {
+            ResultSet rs = stmt.executeQuery();
+            for (int i = 1; i <= 5; i++) {
+                assertTrue(rs.next());
+                assertEquals(i, rs.getInt(1));
+            }
+            assertFalse(rs.next());
+        }
+    }
+
+    @Test(groups = { "integration" })
+    void testWithClauseWithMultipleParameters() throws Exception {
+        try (Connection conn = getJdbcConnection();
+             PreparedStatement stmt = conn.prepareStatement(
+                     "WITH data AS (" +
+                             "    (SELECT number AS n " +
+                             "    FROM numbers(?) " +
+                             "    WHERE n > ?)" +
+                             ") " +
+                             "SELECT * FROM data WHERE n < ?")) {
+//"WITH data AS (    (SELECT number AS n     FROM numbers(?)     WHERE n > ?)) SELECT * FROM data WHERE n < ?"
+            stmt.setInt(1, 10);  // numbers(10) = 0-9
+            stmt.setInt(2, 3);   // n > 3
+            stmt.setInt(3, 7);   // n < 7
+
+            ResultSet rs = stmt.executeQuery();
+            int count = 0;
+            int expected = 4;     // 4,5,6
+            while (rs.next()) {
+                count++;
+                int n = rs.getInt(1);
+                assertTrue(n > 3 && n < 7);
+            }
+            assertEquals(3, count);
+        }
+    }
+
+    @Test(groups = { "integration" })
+    void testSelectFromArray() throws Exception {
+        try (Connection conn = getJdbcConnection();
+             PreparedStatement stmt = conn.prepareStatement(
+                     "SELECT * FROM numbers(?)")) {
+            stmt.setInt(1, 10);  // numbers(10) = 0-9
+            ResultSet rs = stmt.executeQuery();
+            int count = 0;
+            while (rs.next()) {
+                count++;
+            }
+            assertEquals(10, count);
+        }
+    }
+
     @Test(groups = { "integration" })
     void testInsert() throws Exception {
         int ROWS = 1000;