Skip to content

Commit f3adedb

Browse files
author
Paultagoras
committed
Adding extra type checking
1 parent 7dea8ed commit f3adedb

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/AbstractBinaryFormatReader.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,8 @@ protected void setSchema(TableSchema schema) {
253253
case Decimal256:
254254
case Bool:
255255
case String:
256+
case Enum8:
257+
case Enum16:
256258
this.convertions[i] = NumberConverter.NUMBER_CONVERTERS;
257259
break;
258260
default:

client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1975,7 +1975,11 @@ public void testReadingEnumsAsStrings() throws Exception {
19751975
Assert.assertNotNull(reader.next());
19761976
Assert.assertEquals(reader.getByte("idx"), Byte.valueOf("1"));
19771977
Assert.assertEquals(reader.getString("enum1"), "a");
1978+
Assert.assertEquals(reader.getShort("enum1"), 1);
1979+
Assert.assertEquals(reader.getInteger("enum1"), 1);
19781980
Assert.assertEquals(reader.getString("enum2"), "batch");
1981+
Assert.assertEquals(reader.getShort("enum2"), 2);
1982+
Assert.assertEquals(reader.getInteger("enum2"), 2);
19791983
Assert.assertFalse(reader.hasNext());
19801984
}
19811985
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,11 @@ public void testStringTypes() throws SQLException {
355355
assertEquals(rs.getString("str"), str);
356356
assertEquals(rs.getString("fixed"), fixed);
357357
assertEquals(rs.getString("enum"), "a");
358+
assertEquals(rs.getInt("enum"), 6);
358359
assertEquals(rs.getString("enum8"), "a");
360+
assertEquals(rs.getInt("enum8"), 1);
359361
assertEquals(rs.getString("enum16"), "b");
362+
assertEquals(rs.getInt("enum16"), 2);
360363
assertEquals(rs.getString("uuid"), uuid);
361364
assertEquals(rs.getString("ipv4"), "/" + ipv4);
362365
assertEquals(rs.getString("ipv6"), "/" + ipv6);

0 commit comments

Comments
 (0)