Skip to content

[jdbc-v2] Fix Database Metadata issue when wrong column data types are returned #2480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chernser merged 7 commits into from
Jul 1, 2025
Merged

[jdbc-v2] Fix Database Metadata issue when wrong column data types are returned #2480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e098269
Fixed Database Metadata method that returned wrong column types
chernser Jun 30, 2025
91f41ae
added a few test for db metadata
chernser Jun 30, 2025
bc871f2
added test for unsigned integers to check they are returned as number…
chernser Jul 1, 2025
4ec6f21
Merge branch 'main' into jdbc_fix_metadata_issues
chernser Jul 1, 2025
0c42450
fixed after merge
chernser Jul 1, 2025
11e842a
fixed default mapping for integer and unsigned int types
chernser Jul 1, 2025
a3fe0c2
fixed one test
chernser Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 50 additions & 4 deletions jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/JdbcUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@
import com.clickhouse.jdbc.types.Array;
import com.google.common.collect.ImmutableMap;

import java.awt.*;
import java.math.BigInteger;
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.sql.Date;
import java.sql.JDBCType;
import java.sql.SQLException;
import java.sql.SQLType;
import java.sql.Types;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
Expand Down Expand Up @@ -42,6 +45,14 @@ private static Map<ClickHouseDataType, SQLType> generateTypeMap() {
map.put(ClickHouseDataType.Int16, JDBCType.SMALLINT);
map.put(ClickHouseDataType.Int32, JDBCType.INTEGER);
map.put(ClickHouseDataType.Int64, JDBCType.BIGINT);
map.put(ClickHouseDataType.Int128, JDBCType.OTHER);
map.put(ClickHouseDataType.Int256, JDBCType.OTHER);
map.put(ClickHouseDataType.UInt8, JDBCType.SMALLINT);
map.put(ClickHouseDataType.UInt16, JDBCType.INTEGER);
map.put(ClickHouseDataType.UInt32, JDBCType.BIGINT);
map.put(ClickHouseDataType.UInt64, JDBCType.OTHER);
map.put(ClickHouseDataType.UInt128, JDBCType.OTHER);
map.put(ClickHouseDataType.UInt256, JDBCType.OTHER);
map.put(ClickHouseDataType.Float32, JDBCType.FLOAT);
map.put(ClickHouseDataType.Float64, JDBCType.DOUBLE);
map.put(ClickHouseDataType.Bool, JDBCType.BOOLEAN);
Expand Down Expand Up @@ -81,8 +92,8 @@ private static Map<SQLType, Class<?>> generateClassMap() {
map.put(JDBCType.DECIMAL, java.math.BigDecimal.class);
map.put(JDBCType.BIT, Boolean.class);
map.put(JDBCType.BOOLEAN, Boolean.class);
map.put(JDBCType.TINYINT, Integer.class);
map.put(JDBCType.SMALLINT, Integer.class);
map.put(JDBCType.TINYINT, Byte.class);
map.put(JDBCType.SMALLINT, Short.class);
map.put(JDBCType.INTEGER, Integer.class);
map.put(JDBCType.BIGINT, Long.class);
map.put(JDBCType.REAL, Float.class);
Expand Down Expand Up @@ -115,9 +126,44 @@ private static Map<SQLType, Class<?>> generateClassMap() {
private static Map<ClickHouseDataType, Class<?>> getDataTypeClassMap() {
Map<ClickHouseDataType, Class<?>> map = new HashMap<>();
for (Map.Entry<ClickHouseDataType, SQLType> e : CLICKHOUSE_TO_SQL_TYPE_MAP.entrySet()) {
map.put(e.getKey(), SQL_TYPE_TO_CLASS_MAP.get(e.getValue()));
if (e.getValue().equals(JDBCType.OTHER)) {
switch (e.getKey()) {
case UInt64:
map.put(e.getKey(), BigInteger.class);
break;
case UInt128:
map.put(e.getKey(), BigInteger.class);
break;
case UInt256:
map.put(e.getKey(), BigInteger.class);
break;
case Int128:
map.put(e.getKey(), BigInteger.class);
break;
case Int256:
map.put(e.getKey(), BigInteger.class);
break;
case Point:
map.put(e.getKey(), double[].class);
break;
case LineString:
case Ring:
map.put(e.getKey(), double[][].class);
break;
case Polygon:
case MultiLineString:
map.put(e.getKey(), double[][][].class);
break;
case MultiPolygon:
map.put(e.getKey(), double[][][][].class);
break;
default:
map.put(e.getKey(), Object.class);
}
} else {
map.put(e.getKey(), SQL_TYPE_TO_CLASS_MAP.get(e.getValue()));
}
}

return map;
}

Expand Down
Loading
Loading