Merge pull request #2142 from ClickHouse/v2_fix_get_table_schema

fixed getTableSchema by passing database to settings

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/Client.java

@@ -1882,8 +1882,9 @@ public TableSchema getTableSchemaFromQuery(String sql) {
     private TableSchema getTableSchemaImpl(String describeQuery, String name, String originalQuery, String database) {
         int operationTimeout = getOperationTimeout();
 
-        try (QueryResponse response = operationTimeout == 0 ? query(describeQuery).get() :
-                query(describeQuery).get(getOperationTimeout(), TimeUnit.SECONDS)) {
+        QuerySettings settings = new QuerySettings().setDatabase(database);
+        try (QueryResponse response = operationTimeout == 0 ? query(describeQuery, settings).get() :
+                query(describeQuery, settings).get(getOperationTimeout(), TimeUnit.SECONDS)) {
             return TableSchemaParser.readTSKV(response.getInputStream(), name, originalQuery, database);
         } catch (TimeoutException e) {
             throw new ClientException("Operation has likely timed out after " + getOperationTimeout() + " seconds.", e);

client-v2/src/test/java/com/clickhouse/client/insert/InsertTests.java

@@ -105,8 +105,7 @@ protected Client.Builder newClient() {
                 .useHttpCompression(useHttpCompression)
                 .setDefaultDatabase(ClickHouseServerForTest.getDatabase())
                 .serverSetting(ServerSettings.ASYNC_INSERT, "0")
-                .serverSetting(ServerSettings.WAIT_END_OF_QUERY, "1")
-                .useNewImplementation(System.getProperty("client.tests.useNewImplementation", "true").equals("true"));
+                .serverSetting(ServerSettings.WAIT_END_OF_QUERY, "1");
     }
 
     @AfterMethod(groups = { "integration" })
@@ -162,7 +161,7 @@ public void insertPOJOWithJSON() throws Exception {
         client.execute("DROP TABLE IF EXISTS " + tableName, commandSettings).get(EXECUTE_CMD_TIMEOUT, TimeUnit.SECONDS);
         client.execute(createSQL, commandSettings).get(EXECUTE_CMD_TIMEOUT, TimeUnit.SECONDS);
 
-        client.register(PojoWithJSON.class, client.getTableSchema(tableName, "default"));
+        client.register(PojoWithJSON.class, client.getTableSchema(tableName));
         PojoWithJSON pojo = new PojoWithJSON();
         pojo.setEventPayload(originalJsonStr);
         List<Object> data = Arrays.asList(pojo);
@@ -189,7 +188,7 @@ public void insertPOJOAndReadBack() throws Exception {
 
         initTable(tableName, createSQL);
 
-        client.register(SamplePOJO.class, client.getTableSchema(tableName, "default"));
+        client.register(SamplePOJO.class, client.getTableSchema(tableName));
 
         System.out.println("Inserting POJO: " + pojo);
         try (InsertResponse response = client.insert(tableName, Collections.singletonList(pojo), settings).get(EXECUTE_CMD_TIMEOUT, TimeUnit.SECONDS)) {
@@ -231,7 +230,7 @@ public void testInsertingPOJOWithNullValueForNonNullableColumn() throws Exceptio
 
         initTable(tableName, createSQL);
 
-        client.register(SamplePOJO.class, client.getTableSchema(tableName, "default"));
+        client.register(SamplePOJO.class, client.getTableSchema(tableName));
 
         try (InsertResponse response = client.insert(tableName, Collections.singletonList(pojo), settings).get(30, TimeUnit.SECONDS)) {
             fail("Should have thrown an exception");

client-v2/src/test/java/com/clickhouse/client/metadata/MetadataTests.java

@@ -14,7 +14,9 @@
 import com.clickhouse.client.api.internal.ServerSettings;
 import com.clickhouse.client.api.metadata.DefaultColumnToMethodMatchingStrategy;
 import com.clickhouse.client.api.metadata.TableSchema;
+import com.clickhouse.client.api.query.QuerySettings;
 import com.clickhouse.data.ClickHouseColumn;
+import com.clickhouse.data.ClickHouseDataType;
 import com.clickhouse.data.ClickHouseRecord;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
@@ -49,6 +51,24 @@ public void testGetTableSchema() {
         Assert.assertEquals(columns.get(0).getDataType().name(), "UInt32");
     }
 
+    @Test(groups = { "integration" })
+
+    public void testGetTableSchemaDifferentDb() throws Exception {
+        String table = "test_get_table_schema_different_db";
+        String db = ClickHouseServerForTest.getDatabase() + "_schema_test" ;
+        try {
+            QuerySettings settings = new QuerySettings().setDatabase(db);
+            client.execute("DROP DATABASE IF EXISTS " + db).get().close();
+            client.execute("CREATE DATABASE " + db).get().close();
+            client.query("DROP TABLE IF EXISTS " + table, settings).get().close();
+            client.query("CREATE TABLE " + table + " (rowId Int32) Engine=MergeTree ORDER BY ()", settings).get().close();
+            TableSchema tableSchema = client.getTableSchema(table, db);
+            Assert.assertEquals(tableSchema.getColumnByName("rowId").getDataType(), ClickHouseDataType.Int32);
+        } finally {
+            client.execute("DROP DATABASE IF EXISTS " + db).get().close();
+        }
+    }
+
     private void prepareDataSet(String tableName) {
 
         try {

client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java

@@ -1883,7 +1883,7 @@ public void testReadingBitmap() throws Exception {
             throw e;
         }
 
-        client.register(AggregateFuncDTO.class, client.getTableSchema(tableName, "default"));
+        client.register(AggregateFuncDTO.class, client.getTableSchema(tableName));
 
         try (InsertResponse response = client.insert(tableName, Collections.singletonList(pojo)).get(30, TimeUnit.SECONDS)) {
             Assert.assertEquals(response.getWrittenRows(), 1);