Skip to content

Commit 3972bad

Browse files
author
Paultagoras
committed
Tweak so we don't always call getColumn
1 parent 5fd504d commit 3972bad

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

jdbc-v2/src/main/java/com/clickhouse/jdbc/ResultSetImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1520,7 +1520,7 @@ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
15201520
return reader.readValue(columnIndex);
15211521
}
15221522

1523-
return (T) JdbcUtils.convert(reader.readValue(columnIndex), type, getSchema().getColumnByIndex(columnIndex));
1523+
return (T) JdbcUtils.convert(reader.readValue(columnIndex), type, type == java.sql.Array.class ? getSchema().getColumnByIndex(columnIndex) : null);
15241524
} else {
15251525
wasNull = true;
15261526
return null;
@@ -1542,7 +1542,7 @@ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
15421542
return reader.readValue(columnLabel);
15431543
}
15441544

1545-
return (T) JdbcUtils.convert(reader.readValue(columnLabel), type, getSchema().getColumnByName(columnLabel));
1545+
return (T) JdbcUtils.convert(reader.readValue(columnLabel), type, type == java.sql.Array.class ? getSchema().getColumnByName(columnLabel) : null);
15461546
} else {
15471547
wasNull = true;
15481548
return null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ public void testArrayTypes() throws SQLException {
778778
Object[] arraydateResult = (Object[]) ((Array) rs.getObject("arraydate")).getArray();
779779
assertEquals(arraydateResult.length, arraydate.length);
780780
for (int i = 0; i < arraydate.length; i++) {
781-
assertEquals(String.valueOf(arraydateResult[i]), String.valueOf(arraydate[i]));
781+
assertEquals(arraydateResult[i], arraydate[i]);
782782
}
783783
assertFalse(rs.next());
784784
}

0 commit comments

Comments
 (0)