From 71fce1b4c544c9be7d23105f461b4aaae497f166 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 14 Mar 2022 16:53:51 +1300 Subject: [PATCH] #2575 Tidy up for [DDL-ClickHouse] fixes for ClickHouse platform --- .../java/io/ebeaninternal/server/core/DScriptRunner.java | 1 - .../migrationtest/dbmigration/clickhouse/1.1.sql | 8 ++++---- .../dbmigration/clickhouse/idx_clickhouse.migrations | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java index 725b1a66d..06916912c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java @@ -107,7 +107,6 @@ final class DScriptRunner implements ScriptRunner { DdlRunner runner = new DdlRunner(useAutoCommit, scriptName, platformName); runner.runAll(content, connection); if (!connection.getAutoCommit()) { - // Clickhouse fails: Cannot commit when auto-commit is enabled connection.commit(); } runner.runNonTransactional(connection); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.1.sql index 56fd182db..eef3c8083 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.1.sql @@ -48,8 +48,8 @@ alter table migtest_e_basic alter column status2 drop default; alter table migtest_e_basic alter column status2 set null; alter table migtest_e_basic alter column user_id set null; alter table migtest_e_basic add column new_string_field String default 'foo''bar'; -alter table migtest_e_basic add column new_boolean_field UInt8 default true; -alter table migtest_e_basic add column new_boolean_field2 UInt8 default true; +alter table migtest_e_basic add column new_boolean_field UInt8 default 1; +alter table migtest_e_basic add column new_boolean_field2 UInt8 default 1; alter table migtest_e_basic add column progress UInt32 default 0; alter table migtest_e_basic add column new_integer UInt32 default 42; alter table migtest_e_history alter column test_string UInt64; @@ -59,11 +59,11 @@ alter table migtest_e_history2 add column test_string2 String; alter table migtest_e_history2 add column test_string3 String default 'unknown'; alter table migtest_e_history2 add column new_column String; alter table migtest_e_history4 alter column test_number UInt64; -alter table migtest_e_history5 add column test_boolean UInt8 default false; +alter table migtest_e_history5 add column test_boolean UInt8 default 0; alter table migtest_e_history6 alter column test_number1 set default 42; alter table migtest_e_history6 alter column test_number1 set not null; alter table migtest_e_history6 alter column test_number2 set null; -alter table migtest_e_softdelete add column deleted UInt8 default false; +alter table migtest_e_softdelete add column deleted UInt8 default 0; alter table migtest_oto_child add column master_id UInt64; -- apply post alter alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?')); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations index 86feb1c0a..836030b83 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations @@ -1,6 +1,6 @@ --697238714, 1.0__initial.sql --1523257380, 1.1.sql +1588846231, 1.0__initial.sql +-1102375855, 1.1.sql 1279151426, 1.2__dropsFor_1.1.sql -14388492, 1.3.sql +581928632, 1.3.sql 80209848, 1.4__dropsFor_1.3.sql