Skip to content

[jdbc-v2] Fix NPE in ResultSetMetaDataImpl#getColumnClassName #2390

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 1 commit into from
May 28, 2025
Merged

[jdbc-v2] Fix NPE in ResultSetMetaDataImpl#getColumnClassName #2390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion jdbc-v2/src/main/java/com/clickhouse/jdbc/metadata/ResultSetMetaDataImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,11 @@ public boolean isDefinitelyWritable(int column) throws SQLException {
@Override
public String getColumnClassName(int column) throws SQLException {
try {
return typeClassMap.getOrDefault(getColumn(column).getDataType(), Object.class).getName();
Class<?> columnClassType = typeClassMap.get(getColumn(column).getDataType());
if (columnClassType == null) {
columnClassType = Object.class;
}
return columnClassType.getName();
} catch (Exception e) {
throw ExceptionUtils.toSqlState(e);
}
Expand Down
12 changes: 12 additions & 0 deletions jdbc-v2/src/test/java/com/clickhouse/jdbc/metadata/ResultSetMetaDataImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,18 @@ public void testGetColumnTypeIntegers() throws Exception {
}
}

@Test
public void testGetColumnTypeMap() throws Exception {
try (Connection conn = getJdbcConnection()) {
try (Statement stmt = conn.createStatement()) {
ResultSet rs = stmt.executeQuery("select map('a', 1) as a");
ResultSetMetaData rsmd = rs.getMetaData();
assertEquals(rsmd.getColumnType(1), Types.JAVA_OBJECT);
assertEquals(rsmd.getColumnClassName(1), Object.class.getName());
Comment on lines +84 to +87
Copy link

Copilot AI May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider using try-with-resources for ResultSet to ensure it’s closed explicitly, e.g., try (ResultSet rs = stmt.executeQuery(...)).

Suggested change
ResultSet rs = stmt.executeQuery("select map('a', 1) as a");
ResultSetMetaData rsmd = rs.getMetaData();
assertEquals(rsmd.getColumnType(1), Types.JAVA_OBJECT);
assertEquals(rsmd.getColumnClassName(1), Object.class.getName());
try (ResultSet rs = stmt.executeQuery("select map('a', 1) as a")) {
ResultSetMetaData rsmd = rs.getMetaData();
assertEquals(rsmd.getColumnType(1), Types.JAVA_OBJECT);
assertEquals(rsmd.getColumnClassName(1), Object.class.getName());
}

Copilot uses AI. Check for mistakes.
}
}
}

@Test(groups = { "integration" })
public void testGetColumnTypeFloats() throws Exception {
try (Connection conn = getJdbcConnection()) {
Expand Down
Loading