Skip to content

fixed issue with null in legacy driver's json response deserializer + test #879

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
merged 1 commit into from
Apr 4, 2022
Merged

fixed issue with null in legacy driver's json response deserializer + test #879

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
4 changes: 3 additions & 1 deletion ...-jdbc/src/main/java/ru/yandex/clickhouse/response/ClickHouseResponseGsonDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,10 @@ private String getAsString(JsonElement value) {
valueStr = value.getAsString();
} else if (value.isJsonArray()) {
valueStr = arrayToString(value);
} else if (value.isJsonNull()){
valueStr = null;
} else {
throw new IllegalArgumentException("unexpected jsonElementType: " + value.toString());
valueStr = value.toString();
}
return valueStr;
}
Expand Down
10 changes: 10 additions & 0 deletions clickhouse-jdbc/src/test/java/ru/yandex/clickhouse/ClickHouseStatementImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,16 @@ public void testJsonResponse() throws SQLException {
}
}

@Test(groups = "integration")
public void testJsonResponseWithNull() throws SQLException {
try (ClickHouseStatement s = connection.createStatement()) {
ClickHouseResponse response = s.executeQueryClickhouseResponse(
"SELECT 1 AS one, 0/0 AS n");
assertNotNull(response);
assertEquals(response.getData(), Collections.singletonList(Arrays.asList("1", null)));
}
}

private static String readQueryId(ClickHouseStatementImpl stmt, long timeoutSecs) {
long start = System.currentTimeMillis();
String value;
Expand Down