Skip to content

Commit c6335d7

Browse files
committed
fixed enums for different releases
1 parent 35f0b31 commit c6335d7

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -690,22 +690,24 @@ public Object[] getTuple(String colName) {
690690

691691
@Override
692692
public byte getEnum8(String colName) {
693-
return readValue(colName);
693+
BinaryStreamReader.EnumValue enumValue = readValue(colName);
694+
return enumValue.byteValue();
694695
}
695696

696697
@Override
697698
public byte getEnum8(int index) {
698-
return readValue(index);
699+
return getEnum8(schema.columnIndexToName(index));
699700
}
700701

701702
@Override
702703
public short getEnum16(String colName) {
703-
return readValue(colName);
704+
BinaryStreamReader.EnumValue enumValue = readValue(colName);
705+
return enumValue.shortValue();
704706
}
705707

706708
@Override
707709
public short getEnum16(int index) {
708-
return readValue(index);
710+
return getEnum16(schema.columnIndexToName(index));
709711
}
710712

711713
@Override

client-v2/src/test/java/com/clickhouse/client/datatypes/DataTypeTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ public void testDynamicWithPrimitives() throws Exception {
383383
String createTableStatement = " CREATE TABLE " + table + "( rowId Int64, field Dynamic ) " +
384384
"Engine = MergeTree ORDER BY ()";
385385

386-
client.execute(createTableStatement, (CommandSettings) new CommandSettings().serverSetting("enable_dynamic_type", "1"));
386+
client.execute(createTableStatement, (CommandSettings) new CommandSettings().serverSetting("allow_experimental_dynamic_type", "1"));
387387
client.register(DTOForDynamicPrimitivesTests.class, client.getTableSchema(table));
388388

389389
int rowId = 0;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1420,7 +1420,7 @@ private List<Map<String, Object>> prepareDataSet(String table, List<String> colu
14201420
// Create table
14211421
CommandSettings settings = new CommandSettings();
14221422
if (isVersionMatch("[24.8,)")) {
1423-
settings.serverSetting("enable_dynamic_type", "1")
1423+
settings.serverSetting("allow_experimental_dynamic_type", "1")
14241424
.serverSetting("allow_experimental_json_type", "1");
14251425
}
14261426
StringBuilder createStmtBuilder = new StringBuilder();

0 commit comments

Comments
 (0)