Skip to content

Adding issue #2266 tests #2295

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
mzitnik merged 2 commits into from
Apr 10, 2025
Merged

Adding issue #2266 tests #2295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f489bfc
Adding issue #2266 tests
mzitnik Apr 9, 2025
4ee6ff4
Adding to getArray wasNull value change if the retrieve data is null
mzitnik Apr 10, 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
5 changes: 4 additions & 1 deletion jdbc-v2/src/main/java/com/clickhouse/jdbc/ResultSetImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.time.ZonedDateTime;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.List;
import java.util.Map;

import com.clickhouse.client.api.data_formats.ClickHouseBinaryFormatReader;
Expand Down Expand Up @@ -1025,7 +1026,9 @@ public java.sql.Array getArray(String columnLabel) throws SQLException {
checkClosed();
try {
ClickHouseColumn column = getSchema().getColumnByName(columnLabel);
return new Array(reader.getList(columnLabel),
List<Object> lstObj = reader.getList(columnLabel);
wasNull = lstObj == null;
return new Array(lstObj,
column.getArrayBaseColumn().getDataType().name(),
JdbcUtils.convertToSqlType(column.getArrayBaseColumn().getDataType()).getVendorTypeNumber());
} catch (Exception e) {
Expand Down
40 changes: 40 additions & 0 deletions jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,4 +671,44 @@ public void testNullableFixedStringType() throws Exception {
}
}
}

@Test(groups = { "integration" })
public void testWasNullFlagArray() throws Exception {
try (Connection conn = getJdbcConnection()) {
String sql = "SELECT NULL, ['value1', 'value2']";
Statement stmt = conn.createStatement();
stmt.executeQuery(sql);
ResultSet rs = stmt.getResultSet();
assertTrue(rs.next());
int val = rs.getInt(1);
assertTrue(rs.wasNull());
Array arr = rs.getArray(2);
assertFalse(rs.wasNull());
assertNotNull(arr);
Object[] values = (Object[]) arr.getArray();
assertNotNull(values);
assertEquals(values.length, 2);
assertEquals(values[0], "value1");
assertEquals(values[1], "value2");
}

try (Connection conn = getJdbcConnection()) {
String sql = "SELECT NULL, ['value1', 'value2'] AS array";
Statement stmt = conn.createStatement();
stmt.executeQuery(sql);
ResultSet rs = stmt.getResultSet();
assertTrue(rs.next());
int val = rs.getInt(1);
assertTrue(rs.wasNull());
Array arr = rs.getArray("array");
assertFalse(rs.wasNull());
assertNotNull(arr);
Object[] values = (Object[]) arr.getArray();
assertNotNull(values);
assertEquals(values.length, 2);
assertEquals(values[0], "value1");
assertEquals(values[1], "value2");
}
}

}
Loading