From 81443b77bc6093f3c6f9f6fa61e4608ee362d0bb Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Wed, 14 Jun 2023 17:11:36 +0200 Subject: [PATCH] Fixes for Clickhouse platform --- .../dbmigration/ddlgeneration/platform/ClickHouseDbArray.java | 1 + .../java/io/ebean/test/config/platform/ClickHouseSetup.java | 2 +- .../java/io/ebean/platform/clickhouse/ClickHousePlatform.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArray.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArray.java index 469e58420..14838952c 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArray.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDbArray.java @@ -15,6 +15,7 @@ class ClickHouseDbArray { mapping.put("integer[]", "Array(UInt32)"); mapping.put("bigint[]", "Array(UInt64)"); mapping.put("float[]", "Array(Float32)"); + mapping.put("float4[]", "Array(Float32)"); mapping.put("decimal[]", "Array(Decimal)"); } diff --git a/ebean-test/src/main/java/io/ebean/test/config/platform/ClickHouseSetup.java b/ebean-test/src/main/java/io/ebean/test/config/platform/ClickHouseSetup.java index a2a6ca0e0..17b19a38a 100644 --- a/ebean-test/src/main/java/io/ebean/test/config/platform/ClickHouseSetup.java +++ b/ebean-test/src/main/java/io/ebean/test/config/platform/ClickHouseSetup.java @@ -12,7 +12,7 @@ class ClickHouseSetup implements PlatformSetup { config.setUsername("default"); config.setPassword(""); config.setUrl("jdbc:clickhouse://${host}:${port}/${databaseName}"); - config.setDriver("ru.yandex.clickhouse.ClickHouseDriver"); + config.setDriver("com.clickhouse.jdbc.ClickHouseDriver"); config.datasourceDefaults(); return dockerProperties(config); diff --git a/platforms/clickhouse/src/main/java/io/ebean/platform/clickhouse/ClickHousePlatform.java b/platforms/clickhouse/src/main/java/io/ebean/platform/clickhouse/ClickHousePlatform.java index 32ed69ea9..059c3281f 100644 --- a/platforms/clickhouse/src/main/java/io/ebean/platform/clickhouse/ClickHousePlatform.java +++ b/platforms/clickhouse/src/main/java/io/ebean/platform/clickhouse/ClickHousePlatform.java @@ -45,6 +45,7 @@ public class ClickHousePlatform extends DatabasePlatform { dbTypeMap.put(DbType.UUID, new DbPlatformType("UUID", false)); dbTypeMap.put(DbType.INET, new DbPlatformType("String", false)); dbTypeMap.put(DbType.CIDR, new DbPlatformType("String", false)); + dbTypeMap.put(DbType.VARBINARY, new DbPlatformType("String", false)); } @Override