Merge pull request #2406 from ClickHouse/jdbc_fix_unknow_type_problem

[jdbc, client] Fix tests for unknown type

Author: chernser

clickhouse-data/src/main/java/com/clickhouse/data/ClickHouseDataType.java

@@ -7,6 +7,7 @@
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.Period;
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;

client-v2/src/test/java/com/clickhouse/client/datatypes/DataTypeTests.java

@@ -15,6 +15,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -33,8 +34,10 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiConsumer;
 
@@ -603,6 +606,29 @@ public static class DTOForDynamicPrimitivesTests {
         private Object field;
     }
 
+    @Test(groups = {"integration"})
+    public void testAllDataTypesKnown() {
+        List<GenericRecord> dbTypes = client.queryAll("SELECT * FROM system.data_type_families");
+        Set<String> unknowTypes = new HashSet<>();
+        for (GenericRecord dbType : dbTypes) {
+            String aliasFor = dbType.getString("alias_to");
+            String typeToCheck;
+            if (StringUtils.isNoneBlank(aliasFor)) {
+                typeToCheck = aliasFor;
+            } else {
+                typeToCheck = dbType.getString("name");
+            }
+
+            try {
+                ClickHouseDataType.valueOf(typeToCheck);
+            } catch (Exception e) {
+                unknowTypes.add(typeToCheck);
+            }
+        }
+
+        Assert.assertTrue(unknowTypes.isEmpty(), "There are some unknown types: " + unknowTypes);
+    }
+
     private void testDynamicWith(String withWhat, Object[] values, String[] expectedStrValues) throws Exception {
         if (isVersionMatch("(,24.8]")) {
             return;

jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/JdbcUtils.java

@@ -124,7 +124,7 @@ private static Map<ClickHouseDataType, Class<?>> getDataTypeClassMap() {
 
     public static SQLType convertToSqlType(ClickHouseDataType clickhouseType) {
         if (clickhouseType == null) {
-            return JDBCType.NULL;
+            return JDBCType.OTHER;
         }
 
         return CLICKHOUSE_TO_SQL_TYPE_MAP.getOrDefault(clickhouseType, JDBCType.OTHER);

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

@@ -258,7 +258,7 @@ public void testGetTypeInfo() throws Exception {
                     }
                     assertEquals(rs.getInt("SEARCHABLE"), DatabaseMetaData.typeSearchable);
                     assertEquals(rs.getBoolean("UNSIGNED_ATTRIBUTE"), !dataType.isSigned());
-                    assertEquals(rs.getBoolean("FIXED_PREC_SCALE"), false);
+                    assertFalse(rs.getBoolean("FIXED_PREC_SCALE"));
                     assertFalse(rs.getBoolean("AUTO_INCREMENT"));
                     assertEquals(rs.getString("LOCAL_TYPE_NAME"), dataType.name());
                     assertEquals(rs.getInt("MINIMUM_SCALE"), dataType.getMinScale());