Skip to content

Commit bda902e

Browse files
committed
added Time/Tim64 convertion to Time and handling other types
1 parent 597ad85 commit bda902e

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

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

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
package com.clickhouse.jdbc.internal;
22

3-
import com.clickhouse.client.api.DataTypeUtils;
43
import com.clickhouse.client.api.data_formats.internal.BinaryStreamReader;
54
import com.clickhouse.client.api.data_formats.internal.InetAddressConverter;
65
import com.clickhouse.data.ClickHouseColumn;
76
import com.clickhouse.data.ClickHouseDataType;
87
import com.clickhouse.data.Tuple;
9-
import com.clickhouse.data.format.BinaryStreamUtils;
10-
import com.clickhouse.jdbc.PreparedStatementImpl;
118
import com.clickhouse.jdbc.types.Array;
129
import com.google.common.collect.ImmutableMap;
13-
import org.slf4j.Logger;
1410

15-
import java.awt.*;
1611
import java.math.BigInteger;
1712
import java.net.Inet4Address;
1813
import java.net.Inet6Address;
@@ -22,12 +17,13 @@
2217
import java.sql.SQLException;
2318
import java.sql.SQLType;
2419
import java.sql.Time;
25-
import java.sql.Types;
26-
import java.time.*;
27-
import java.time.chrono.ChronoZonedDateTime;
20+
import java.time.Instant;
21+
import java.time.LocalDate;
22+
import java.time.LocalDateTime;
23+
import java.time.LocalTime;
24+
import java.time.OffsetDateTime;
25+
import java.time.ZonedDateTime;
2826
import java.time.temporal.TemporalAccessor;
29-
import java.util.ArrayList;
30-
import java.util.Arrays;
3127
import java.util.Collections;
3228
import java.util.EnumSet;
3329
import java.util.HashMap;
@@ -37,7 +33,6 @@
3733
import java.util.Stack;
3834
import java.util.TreeMap;
3935
import java.util.function.Function;
40-
import java.util.stream.Collectors;
4136

4237
public class JdbcUtils {
4338
//Define a map to store the mapping between ClickHouse data types and SQL data types
@@ -299,10 +294,10 @@ public static Object convert(Object value, Class<?> type, ClickHouseColumn colum
299294
return new Array(column, arrayValue.getArrayOfObjects());
300295
}
301296

302-
return convertObject(value, type, column);
297+
return convertObject(value, type);
303298
}
304299

305-
public static Object convertObject(Object value, Class<?> type, ClickHouseColumn column) throws SQLException {
300+
public static Object convertObject(Object value, Class<?> type) throws SQLException {
306301
if (value == null || type == null) {
307302
return value;
308303
}

0 commit comments

Comments
 (0)