Merge branch 'main' into v2_support_dynamic_and_json

Author: chernser

clickhouse-r2dbc/src/main/java/com/clickhouse/r2dbc/ClickHouseStatement.java

@@ -156,6 +156,6 @@ public Flux<? extends Result> execute() {
 
     @Override
     public Statement returnGeneratedValues(String... columns) {
-        throw new UnsupportedOperationException(GENERATED_VALUES_CAN_NOT_BE_RETURNED_FROM_CLICKHOUSE_DATABASE);
+        return this;
     }
 }

clickhouse-r2dbc/src/test/java/com/clickhouse/r2dbc/spi/test/R2DBCTestKitImplTest.java

@@ -207,40 +207,16 @@ public void duplicateColumnNames() {
 
     @Override
     @Test
+    @Disabled
     public void returnGeneratedValues() {
-        getJdbcOperations().execute(expand(TestStatement.DROP_TABLE));
-        getJdbcOperations().execute(getCreateTableWithAutogeneratedKey());
-        Flux.usingWhen(getConnectionFactory().create(),
-                connection -> {
-                    Statement statement = connection.createStatement(getInsertIntoWithAutogeneratedKey());
-
-                    statement.returnGeneratedValues();
-
-                    return Flux.from(statement
-                            .execute())
-                            .flatMap(it -> it.map((row, rowMetadata) -> row.get(0)));
-                },
-                Connection::close)
-                .as(StepVerifier::create)
-                .expectErrorMatches(UnsupportedOperationException.class::isInstance)
-                .verify();
+        // not supported
     }
 
     @Override
     @Test
+    @Disabled
     public void returnGeneratedValuesFails() {
-
-        Flux.usingWhen(getConnectionFactory().create(),
-                connection -> {
-                    Statement statement = connection.createStatement(expand(TestStatement.INSERT_VALUE100));
-
-                    assertThrows(UnsupportedOperationException.class,
-                            () -> statement.returnGeneratedValues((String[]) null));
-                    return Mono.empty();
-                },
-                Connection::close)
-                .as(StepVerifier::create)
-                .verifyComplete();
+        // not supported
     }
 
     @Override

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;
@@ -366,6 +367,13 @@ public boolean execute(String sql, QuerySettings settings) throws SQLException {
                 }
             }
             return false;
+        } else if (type == StatementType.USE) {
+            executeUpdate(sql, settings);
+            //USE Database
+            List<String> tokens = JdbcUtils.tokenizeSQL(sql);
+            this.schema = tokens.get(1).replace("\"", "");
+            LOG.info("Changed statement schema " + schema);
+            return false;
         } else {
             executeUpdate(sql, settings);
             return false;

jdbc-v2/src/main/java/com/clickhouse/jdbc/metadata/ResultSetMetaData.java

@@ -165,6 +165,6 @@ public boolean isDefinitelyWritable(int column) throws SQLException {
 
     @Override
     public String getColumnClassName(int column) throws SQLException {
-        throw new SQLException("Not implemented", ExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);
+        return null;
     }
 }

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,32 @@ 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);
+    }
+
+    @Test(groups = { "integration" })
+    public void testSwitchDatabase() throws Exception {
+        String createSql = "CREATE TABLE switchDatabaseWithUse (id UInt8, words String) ENGINE = MergeTree ORDER BY ()";
+        try (Connection conn = getJdbcConnection()) {
+            try (Statement stmt = conn.createStatement()) {
+                assertEquals(stmt.executeUpdate(createSql), 0);
+                assertEquals(stmt.executeUpdate("CREATE DATABASE \"newDatabase\" ENGINE=Atomic"), 0);
+                assertFalse(stmt.execute("USE \"newDatabase\""));
+                assertEquals(stmt.executeUpdate(createSql), 0);
+            }
+        }
+    }
 }