cleanup

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/internal/TableSchemaParser.java

@@ -3,10 +3,12 @@
 import com.clickhouse.client.api.ClientException;
 import com.clickhouse.client.api.metadata.TableSchema;
 import com.clickhouse.data.ClickHouseColumn;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
@@ -26,9 +28,9 @@ public static TableSchema readTSKV(InputStream content, String table, String sql
                     final String columnType = p.getProperty("type");
                     ClickHouseColumn column;
                     try {
-                        column = ClickHouseColumn.of(columnName, p.getProperty("type"));
+                        column = ClickHouseColumn.of(columnName, columnType);
                     } catch (IllegalArgumentException e) {
-                        throw new ClientException("Failed parse column `"+ columnName + "` definition of type '" + columnType + "'", e);
+                        throw new ClientException("Failed parse column `"+ columnName + "` defined by type '" + columnType + "'", e);
                     }
                     String defaultType = p.getProperty("default_type");
                     String defaultExpression = p.getProperty("default_expression");

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

@@ -1,25 +1,19 @@
 package com.clickhouse.client.metadata;
 
 import com.clickhouse.client.BaseIntegrationTest;
-import com.clickhouse.client.ClickHouseClient;
-import com.clickhouse.client.ClickHouseConfig;
 import com.clickhouse.client.ClickHouseNode;
-import com.clickhouse.client.ClickHouseNodeSelector;
 import com.clickhouse.client.ClickHouseProtocol;
-import com.clickhouse.client.ClickHouseRequest;
-import com.clickhouse.client.ClickHouseResponse;
 import com.clickhouse.client.ClickHouseServerForTest;
 import com.clickhouse.client.api.Client;
+import com.clickhouse.client.api.command.CommandSettings;
 import com.clickhouse.client.api.enums.Protocol;
 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.command.CommandSettings;
 import com.clickhouse.client.api.query.GenericRecord;
 import com.clickhouse.client.api.query.QuerySettings;
 import com.clickhouse.data.ClickHouseColumn;
 import com.clickhouse.data.ClickHouseDataType;
-import com.clickhouse.data.ClickHouseRecord;
 import com.clickhouse.data.ClickHouseVersion;
 import org.apache.commons.lang3.StringUtils;
 import org.testng.Assert;
@@ -28,7 +22,6 @@
 import org.testng.annotations.Test;
 
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -251,36 +244,6 @@ private String getColumnTypeDefinition(String typeName) {
                 return "Object('json' String)";
             case "Variant":
                 return "Variant(String, Int32)";
-            case "Dynamic":
-                return "Dynamic";
-            case "JSON":
-                return "JSON";
-            case "IntervalYear":
-                return "IntervalYear";
-            case "IntervalQuarter":
-                return "IntervalQuarter";
-            case "IntervalMonth":
-                return "IntervalMonth";
-            case "IntervalWeek":
-                return "IntervalWeek";
-            case "IntervalDay":
-                return "IntervalDay";
-            case "IntervalHour":
-                return "IntervalHour";
-            case "IntervalMinute":
-                return "IntervalMinute";
-            case "IntervalSecond":
-                return "IntervalSecond";
-            case "IntervalMicrosecond":
-                return "IntervalMicrosecond";
-            case "IntervalMillisecond":
-                return "IntervalMillisecond";
-            case "IntervalNanosecond":
-                return "IntervalNanosecond";
-            case "Time":
-                return "Time";
-            case "Time64":
-                return "Time64";
             case "QBit":
                 // QBit requires two parameters: element type and number of elements
                 return "QBit(Float32, 4)";

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

@@ -1127,7 +1127,7 @@ public ResultSet getTypeInfo() throws SQLException {
                 type = JdbcUtils.convertToSqlType(ClickHouseDataType.valueOf(typeName));
             } catch (IllegalArgumentException e) {
                 log.error("Unknown type: " + typeName + ". Please check for a new version of the client.");
-                type = JDBCType.OTHER; // In case of error, return SQL type 0
+                type = JDBCType.OTHER;
             } catch (Exception e) {
                 log.error("Failed to get SQL type for type: " + typeName, e);
                 type = JDBCType.OTHER;