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/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 {