Ddl fixes for clickhouse platform

This commit is contained in:
Roland Praml committed 2022-02-25 12:10:54 +01:00
1 parent 897a97d415
commit b88e4a35f8
6 files changed
+15 -10

No files matched your search

@@ -18,6 +18,8 @@ public class ClickHousePlatform extends DatabasePlatform {
//this.exceptionTranslator = //this.exceptionTranslator =
this.nativeUuidType = true; this.nativeUuidType = true;
this.dbDefaultValue.setNow("now()"); this.dbDefaultValue.setNow("now()");
this.dbDefaultValue.setFalse("0");
this.dbDefaultValue.setTrue("1");
this.dbIdentity.setIdType(IdType.IDENTITY); this.dbIdentity.setIdType(IdType.IDENTITY);
this.dbIdentity.setSupportsGetGeneratedKeys(false); this.dbIdentity.setSupportsGetGeneratedKeys(false);
@@ -106,7 +106,10 @@ final class DScriptRunner implements ScriptRunner {
try (Connection connection = obtainConnection()) { try (Connection connection = obtainConnection()) {
DdlRunner runner = new DdlRunner(useAutoCommit, scriptName, platformName); DdlRunner runner = new DdlRunner(useAutoCommit, scriptName, platformName);
runner.runAll(content, connection); runner.runAll(content, connection);
connection.commit(); if (!connection.getAutoCommit()) {
// Clickhouse fails: Cannot commit when auto-commit is enabled
connection.commit();
}
runner.runNonTransactional(connection); runner.runNonTransactional(connection);
} }
@@ -53,7 +53,7 @@ create table migtest_e_basic (
description String, description String,
description_file blob, description_file blob,
some_date DateTime, some_date DateTime,
old_boolean UInt8 default false, old_boolean UInt8 default 0,
old_boolean2 UInt8, old_boolean2 UInt8,
eref_id UInt32, eref_id UInt32,
indextest1 String, indextest1 String,
@@ -41,10 +41,10 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique
insert into migtest_e_user (id) select distinct user_id from migtest_e_basic; insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
alter table migtest_e_basic alter column user_id 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_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_field UInt8 default 1;
update migtest_e_basic set new_boolean_field = old_boolean; update migtest_e_basic set new_boolean_field = old_boolean;
alter table migtest_e_basic add column new_boolean_field2 UInt8 default true; 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 progress UInt32 default 0;
alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2)); alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2));
alter table migtest_e_basic add column new_integer UInt32 default 42; alter table migtest_e_basic add column new_integer UInt32 default 42;
@@ -67,7 +67,7 @@ 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_history2 add column new_column String;
alter table migtest_e_history4 alter column test_number UInt64; 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;
-- NOTE: table has @History - special migration may be necessary -- NOTE: table has @History - special migration may be necessary
@@ -75,7 +75,7 @@ update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
alter table migtest_e_history6 alter column test_number1 set default 42; 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_number1 set not null;
alter table migtest_e_history6 alter column test_number2 set 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; alter table migtest_oto_child add column master_id UInt64;
@@ -22,7 +22,7 @@ update migtest_e_basic set user_id = 23 where user_id is null;
alter table migtest_e_basic alter column user_id set default 23; alter table migtest_e_basic alter column user_id set default 23;
alter table migtest_e_basic alter column user_id set not null; alter table migtest_e_basic alter column user_id set not null;
alter table migtest_e_basic add column description_file blob; alter table migtest_e_basic add column description_file blob;
alter table migtest_e_basic add column old_boolean UInt8 default false; alter table migtest_e_basic add column old_boolean UInt8 default 0;
alter table migtest_e_basic add column old_boolean2 UInt8; alter table migtest_e_basic add column old_boolean2 UInt8;
alter table migtest_e_basic add column eref_id UInt32; alter table migtest_e_basic add column eref_id UInt32;
@@ -1,6 +1,6 @@
-697238714, 1.0__initial.sql 1588846231, 1.0__initial.sql
1864520180, 1.1.sql 1281122711, 1.1.sql
628353409, 1.2__dropsFor_1.1.sql 628353409, 1.2__dropsFor_1.1.sql
-489730240, 1.3.sql -1091184932, 1.3.sql
-1045594368, 1.4__dropsFor_1.3.sql -1045594368, 1.4__dropsFor_1.3.sql