fixed reading type of Nullable and issue with changing user after loading server info

Author: chernser

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

@@ -136,6 +136,7 @@ public class Client implements AutoCloseable {
     private final Map<ClickHouseDataType, Class<?>> typeHintMapping;
 
     // Server context
+    private String dbUser;
     private String serverVersion;
     private Object metricsRegistry;
     private int retries;
@@ -196,7 +197,7 @@ private Client(Set<String> endpoints, Map<String,String> configuration,
         }
 
         this.serverVersion = configuration.getOrDefault(ClientConfigProperties.SERVER_VERSION.getKey(), "unknown");
-
+        this.dbUser = configuration.getOrDefault(ClientConfigProperties.USER.getKey(), ClientConfigProperties.USER.getDefObjVal());
         this.typeHintMapping = (Map<ClickHouseDataType, Class<?>>) this.configuration.get(ClientConfigProperties.TYPE_HINT_MAPPING.getKey());
     }
 
@@ -208,7 +209,10 @@ public void loadServerInfo() {
         try (QueryResponse response = this.query("SELECT currentUser() AS user, timezone() AS timezone, version() AS version LIMIT 1").get()) {
             try (ClickHouseBinaryFormatReader reader = this.newBinaryFormatReader(response)) {
                 if (reader.next() != null) {
-                    this.configuration.put(ClientConfigProperties.USER.getKey(), reader.getString("user"));
+                    String tmpDbUser = reader.getString("user");
+                    if (tmpDbUser != null && !tmpDbUser.isEmpty()) {
+                        this.dbUser = tmpDbUser;
+                    }
                     this.configuration.put(ClientConfigProperties.SERVER_TIMEZONE.getKey(), reader.getString("timezone"));
                     serverVersion = reader.getString("version");
                 }
@@ -2041,7 +2045,7 @@ public Set<String> getEndpoints() {
     }
 
     public String getUser() {
-        return (String) this.configuration.get(ClientConfigProperties.USER.getKey());
+        return dbUser;
     }
 
     public String getServerVersion() {

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

@@ -233,8 +233,10 @@ public void setNetworkTimeout(long timeout, ChronoUnit unit) {
      * @return timeout in ms.
      */
     public Long getNetworkTimeout() {
-        return (Long) getOption(ClientConfigProperties.SOCKET_OPERATION_TIMEOUT.getKey(),
-                ClientConfigProperties.SOCKET_OPERATION_TIMEOUT.getDefaultValue());
+        // Socket operation timeout must be integer because of OS interface
+        // Network timeout may be something else in the future. So we need to cast it to Long.
+        return ((Number) getOption(ClientConfigProperties.SOCKET_OPERATION_TIMEOUT.getKey(),
+                ClientConfigProperties.SOCKET_OPERATION_TIMEOUT.getDefObjVal())).longValue();
     }
 
 

client-v2/src/test/java/com/clickhouse/client/SettingsTests.java

@@ -105,6 +105,8 @@ void testQuerySettingsSpecific() throws Exception {
 
         {
             final QuerySettings settings = new QuerySettings();
+            Assert.assertEquals(settings.getNetworkTimeout().intValue(),
+                    (Integer) ClientConfigProperties.SOCKET_OPERATION_TIMEOUT.getDefObjVal());
             settings.setNetworkTimeout(10, ChronoUnit.SECONDS);
             Assert.assertEquals(settings.getNetworkTimeout(), TimeUnit.SECONDS.toMillis(10));
         }
@@ -164,6 +166,8 @@ public void testInsertSettingsSpecific() throws Exception {
 
         {
             final InsertSettings settings = new InsertSettings();
+            Assert.assertEquals(settings.getNetworkTimeout().intValue(),
+                    (Integer) ClientConfigProperties.SOCKET_OPERATION_TIMEOUT.getDefObjVal());
             settings.setNetworkTimeout(10, ChronoUnit.SECONDS);
             Assert.assertEquals(settings.getNetworkTimeout(), TimeUnit.SECONDS.toMillis(10));
         }

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

@@ -895,7 +895,9 @@ private static String generateSqlTypeSizes(String columnName) {
         SQLType type = JdbcUtils.CLICKHOUSE_TYPE_NAME_TO_SQL_TYPE_MAP.get(typeName);
         if (type == null) {
             try {
-                type = JdbcUtils.convertToSqlType(ClickHouseDataType.valueOf(typeName));
+                ClickHouseColumn c = ClickHouseColumn.of("v", typeName);
+                ClickHouseDataType dt = c.getDataType();
+                type = JdbcUtils.convertToSqlType(dt);
             } catch (Exception e) {
                 log.error("Failed to convert column data type to SQL type: {}", typeName, e);
                 type = JDBCType.OTHER; // In case of error, return SQL type 0
@@ -1092,8 +1094,23 @@ public ResultSet getTypeInfo() throws SQLException {
         row.put("NULLABLE", nullability);
     };
 
+    private static final Consumer<Map<String, Object>> TYPE_INFO_VALUE_FUNCTION = row -> {
+        String typeName = (String) row.get("TYPE_NAME");
+        SQLType type = JdbcUtils.CLICKHOUSE_TYPE_NAME_TO_SQL_TYPE_MAP.get(typeName);
+        if (type == null) {
+            try {
+                type = JdbcUtils.convertToSqlType(ClickHouseDataType.valueOf(typeName));
+            } catch (Exception e) {
+                log.error("Failed to convert column data type to SQL type: {}", typeName, e);
+                type = JDBCType.OTHER; // In case of error, return SQL type 0
+            }
+        }
+
+        row.put("DATA_TYPE", type.getVendorTypeNumber());
+    };
+
     private static final List<Consumer<Map<String, Object>>> GET_TYPE_INFO_MUTATORS = Arrays.asList(
-            DATA_TYPE_VALUE_FUNCTION,
+            TYPE_INFO_VALUE_FUNCTION,
             NULLABILITY_VALUE_FUNCTION
     );
 

jdbc-v2/src/test/java/com/clickhouse/jdbc/metadata/DatabaseMetaDataTest.java

@@ -40,7 +40,7 @@ public void testGetColumns() throws Exception {
             final String tableName = "get_columns_metadata_test";
             try (Statement stmt = conn.createStatement()) {
                 stmt.executeUpdate("" +
-                        "CREATE TABLE " + tableName + " (id Int32, name String NOT NULL, v1 Nullable(Int8)) " +
+                        "CREATE TABLE " + tableName + " (id Int32, name String NOT NULL, v1 Nullable(Int8), v2 Array(Int8)) " +
                         "ENGINE MergeTree ORDER BY ()");
             }
 
@@ -131,6 +131,15 @@ public void testGetColumns() throws Exception {
                 assertEquals(rs.getObject("DATA_TYPE"), Types.TINYINT);
                 assertEquals(rs.getString("TYPE_NAME"), "Nullable(Int8)");
                 assertTrue(rs.getBoolean("NULLABLE"));
+
+                assertTrue(rs.next());
+                assertEquals(rs.getString("TABLE_SCHEM"), getDatabase());
+                assertEquals(rs.getString("TABLE_NAME"), tableName);
+                assertEquals(rs.getString("COLUMN_NAME"), "v2");
+                assertEquals(rs.getInt("DATA_TYPE"), Types.ARRAY);
+                assertEquals(rs.getObject("DATA_TYPE"), Types.ARRAY);
+                assertEquals(rs.getString("TYPE_NAME"), "Array(Int8)");
+                assertFalse(rs.getBoolean("NULLABLE"));
             }
         }
     }