Adjusting to just Timezone type

Author: Paultagoras

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

@@ -46,9 +46,9 @@ private static Map<ClickHouseDataType, SQLType> generateTypeMap() {
         map.put(ClickHouseDataType.Enum16, JDBCType.VARCHAR);
         map.put(ClickHouseDataType.Date, JDBCType.DATE);
         map.put(ClickHouseDataType.Date32, JDBCType.DATE);
-        map.put(ClickHouseDataType.DateTime, JDBCType.TIMESTAMP_WITH_TIMEZONE);
-        map.put(ClickHouseDataType.DateTime32, JDBCType.TIMESTAMP_WITH_TIMEZONE);
-        map.put(ClickHouseDataType.DateTime64, JDBCType.TIMESTAMP_WITH_TIMEZONE);
+        map.put(ClickHouseDataType.DateTime, JDBCType.TIMESTAMP);
+        map.put(ClickHouseDataType.DateTime32, JDBCType.TIMESTAMP);
+        map.put(ClickHouseDataType.DateTime64, JDBCType.TIMESTAMP);
         map.put(ClickHouseDataType.Array, JDBCType.ARRAY);
         map.put(ClickHouseDataType.Nested, JDBCType.ARRAY);
         map.put(ClickHouseDataType.Map, JDBCType.JAVA_OBJECT);

jdbc-v2/src/test/java/com/clickhouse/jdbc/DataTypeTests.java

@@ -899,28 +899,28 @@ public void testTypeConversions() throws Exception {
                     assertEquals(rs.getString(5), "2024-12-01T12:34:56Z[UTC]");
                     assertEquals(rs.getObject(5, LocalDateTime.class), LocalDateTime.of(2024, 12, 1, 12, 34, 56));
                     assertEquals(rs.getObject(5, ZonedDateTime.class), ZonedDateTime.of(2024, 12, 1, 12, 34, 56, 0, ZoneId.of("UTC")));
-                    assertEquals(String.valueOf(rs.getObject(5, new HashMap<String, Class<?>>(){{put(JDBCType.TIMESTAMP_WITH_TIMEZONE.getName(), LocalDateTime.class);}})), "2024-12-01T12:34:56");
+                    assertEquals(String.valueOf(rs.getObject(5, new HashMap<String, Class<?>>(){{put(JDBCType.TIMESTAMP.getName(), LocalDateTime.class);}})), "2024-12-01T12:34:56");
 
                     assertEquals(rs.getTimestamp(6), Timestamp.valueOf("2024-12-01 12:34:56.789"));
                     assertTrue(rs.getObject(6) instanceof Timestamp);
                     assertEquals(rs.getObject(6), Timestamp.valueOf("2024-12-01 12:34:56.789"));
                     assertEquals(rs.getString(6), "2024-12-01T12:34:56.789Z[UTC]");
                     assertEquals(rs.getObject(6, LocalDateTime.class), LocalDateTime.of(2024, 12, 1, 12, 34, 56, 789000000));
-                    assertEquals(String.valueOf(rs.getObject(6, new HashMap<String, Class<?>>(){{put(JDBCType.TIMESTAMP_WITH_TIMEZONE.getName(), LocalDateTime.class);}})), "2024-12-01T12:34:56.789");
+                    assertEquals(String.valueOf(rs.getObject(6, new HashMap<String, Class<?>>(){{put(JDBCType.TIMESTAMP.getName(), LocalDateTime.class);}})), "2024-12-01T12:34:56.789");
 
                     assertEquals(rs.getTimestamp(7), Timestamp.valueOf("2024-12-01 12:34:56.789789"));
                     assertTrue(rs.getObject(7) instanceof Timestamp);
                     assertEquals(rs.getObject(7), Timestamp.valueOf("2024-12-01 12:34:56.789789"));
                     assertEquals(rs.getString(7), "2024-12-01T12:34:56.789789Z[UTC]");
                     assertEquals(rs.getObject(7, LocalDateTime.class), LocalDateTime.of(2024, 12, 1, 12, 34, 56, 789789000));
-                    assertEquals(String.valueOf(rs.getObject(7, new HashMap<String, Class<?>>(){{put(JDBCType.TIMESTAMP_WITH_TIMEZONE.getName(), OffsetDateTime.class);}})), "2024-12-01T12:34:56.789789Z");
+                    assertEquals(String.valueOf(rs.getObject(7, new HashMap<String, Class<?>>(){{put(JDBCType.TIMESTAMP.getName(), OffsetDateTime.class);}})), "2024-12-01T12:34:56.789789Z");
 
                     assertEquals(rs.getTimestamp(8), Timestamp.valueOf("2024-12-01 12:34:56.789789789"));
                     assertTrue(rs.getObject(8) instanceof Timestamp);
                     assertEquals(rs.getObject(8), Timestamp.valueOf("2024-12-01 12:34:56.789789789"));
                     assertEquals(rs.getString(8), "2024-12-01T12:34:56.789789789Z[UTC]");
                     assertEquals(rs.getObject(8, LocalDateTime.class), LocalDateTime.of(2024, 12, 1, 12, 34, 56, 789789789));
-                    assertEquals(String.valueOf(rs.getObject(8, new HashMap<String, Class<?>>(){{put(JDBCType.TIMESTAMP_WITH_TIMEZONE.getName(), ZonedDateTime.class);}})), "2024-12-01T12:34:56.789789789Z[UTC]");
+                    assertEquals(String.valueOf(rs.getObject(8, new HashMap<String, Class<?>>(){{put(JDBCType.TIMESTAMP.getName(), ZonedDateTime.class);}})), "2024-12-01T12:34:56.789789789Z[UTC]");
                 }
             }
         }

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

@@ -40,7 +40,7 @@ public void testGetColumns() throws Exception {
             List<String> columnNames = Arrays.asList("id", "name", "float1", "fixed_string1", "decimal_1", "nullable_column", "date", "datetime");
             List<String> columnTypes = Arrays.asList("UInt64", "String", "Float32", "FixedString(10)", "Decimal(10, 2)", "Nullable(Decimal(5, 4))", "Date", "DateTime");
             List<Integer> columnSizes = Arrays.asList(8, 0, 4, 10, 10, 5, 2, 0);
-            List<Integer> columnJDBCDataTypes = Arrays.asList(Types.BIGINT, Types.VARCHAR, Types.FLOAT, Types.CHAR, Types.DECIMAL, Types.DECIMAL, Types.DATE, Types.TIMESTAMP_WITH_TIMEZONE);
+            List<Integer> columnJDBCDataTypes = Arrays.asList(Types.BIGINT, Types.VARCHAR, Types.FLOAT, Types.CHAR, Types.DECIMAL, Types.DECIMAL, Types.DATE, Types.TIMESTAMP);
             List<String> columnTypeNames = Arrays.asList("UInt64", "String", "Float32", "FixedString(10)", "Decimal(10, 2)", "Nullable(Decimal(5, 4))", "Date", "DateTime");
             List<Boolean> columnNullable = Arrays.asList(false, false, false, false, false, true, false, false);
             List<Integer> columnDecimalDigits = Arrays.asList(null, null, null, null, 2, 4, null, null);

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

@@ -91,7 +91,7 @@ public void testGetColumnTypeDateAndTime() throws Exception {
                 ResultSet rs = stmt.executeQuery("SELECT toDate('2021-01-01') AS a, toDateTime('2021-01-01 00:00:00') AS b");
                 ResultSetMetaData rsmd = rs.getMetaData();
                 assertEquals(rsmd.getColumnType(1), Types.DATE);
-                assertEquals(rsmd.getColumnType(2), Types.TIMESTAMP_WITH_TIMEZONE);
+                assertEquals(rsmd.getColumnType(2), Types.TIMESTAMP);
             }
         }
     }