From 73fba80e2ce9df92203d298cff6dd5b478815af3 Mon Sep 17 00:00:00 2001 From: Rafi Shamim Date: Sun, 24 Sep 2023 10:29:26 -0400 Subject: [PATCH 1/2] Fix getTableNames for cockroachdb The query to fetch table names was incorrectly including internal tables that are part of the crdb_internal schema. --- .../impl/persistence/entity/TableDataManagerImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/persistence/entity/TableDataManagerImpl.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/persistence/entity/TableDataManagerImpl.java index 38a332b7852..4dd50e1c232 100644 --- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/persistence/entity/TableDataManagerImpl.java +++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/persistence/entity/TableDataManagerImpl.java @@ -101,6 +101,12 @@ protected List getTableNames(DatabaseMetaData databaseMetaData, String c List tableNames = new ArrayList<>(); try (ResultSet tables = databaseMetaData.getTables(catalog, schema, tableNameFilter, DbSqlSession.JDBC_METADATA_TABLE_TYPES)) { while (tables.next()) { + if ("cockroachdb".equals(getDbSqlSession().getDbSqlSessionFactory().getDatabaseType())) { + String schemaName = tables.getString("TABLE_SCHEM"); + if ("crdb_internal".equals(schemaName)) { + continue; + } + } String tableName = tables.getString("TABLE_NAME"); tableName = tableName.toUpperCase(Locale.ROOT); tableNames.add(tableName); From 9ce12ceabb9aa37e57059007bfe0d2381557e8c0 Mon Sep 17 00:00:00 2001 From: Rafi Shamim Date: Sun, 24 Sep 2023 10:37:33 -0400 Subject: [PATCH 2/2] Remove force commit from cockroachdb setup CockroachDB has auto-commit, so forcing a commit would result in an error. --- .../service/db/create/flowable.cockroachdb.create.batch.sql | 1 - .../batch/service/db/drop/flowable.cockroachdb.drop.batch.sql | 1 - .../common/db/create/flowable.cockroachdb.create.common.sql | 1 - .../common/db/drop/flowable.cockroachdb.drop.common.sql | 1 - .../flowable/db/create/flowable.cockroachdb.create.engine.sql | 2 +- .../db/create/flowable.cockroachdb.create.history.sql | 2 +- .../org/flowable/db/drop/flowable.cockroachdb.drop.engine.sql | 1 - .../flowable/db/drop/flowable.cockroachdb.drop.history.sql | 2 +- .../create/flowable.cockroachdb.create.entitylink.history.sql | 1 - .../db/create/flowable.cockroachdb.create.entitylink.sql | 1 - .../db/drop/flowable.cockroachdb.drop.entitylink.history.sql | 1 - .../service/db/drop/flowable.cockroachdb.drop.entitylink.sql | 1 - .../flowable.cockroachdb.create.identitylink.history.sql | 1 - .../db/create/flowable.cockroachdb.create.identitylink.sql | 1 - .../drop/flowable.cockroachdb.drop.identitylink.history.sql | 1 - .../db/drop/flowable.cockroachdb.drop.identitylink.sql | 1 - .../idm/db/create/flowable.cockroachdb.create.identity.sql | 3 +-- .../idm/db/drop/flowable.cockroachdb.drop.identity.sql | 1 - .../job/service/db/create/flowable.cockroachdb.create.job.sql | 3 +-- .../job/service/db/drop/flowable.cockroachdb.drop.job.sql | 1 - .../db/create/flowable.cockroachdb.create.task.history.sql | 1 - .../service/db/create/flowable.cockroachdb.create.task.sql | 1 - .../db/drop/flowable.cockroachdb.drop.task.history.sql | 1 - .../task/service/db/drop/flowable.cockroachdb.drop.task.sql | 2 +- .../create/flowable.cockroachdb.create.variable.history.sql | 1 - .../db/create/flowable.cockroachdb.create.variable.sql | 4 ++-- .../db/drop/flowable.cockroachdb.drop.variable.history.sql | 1 - .../service/db/drop/flowable.cockroachdb.drop.variable.sql | 1 - 28 files changed, 8 insertions(+), 31 deletions(-) diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.cockroachdb.create.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.cockroachdb.create.batch.sql index f2f7267c115..6bd69b193e4 100644 --- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.cockroachdb.create.batch.sql +++ b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.cockroachdb.create.batch.sql @@ -39,4 +39,3 @@ alter table FLW_RU_BATCH_PART insert into ACT_GE_PROPERTY values ('batch.schema.version', '7.0.0.0', 1); --- force-commit \ No newline at end of file diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.cockroachdb.drop.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.cockroachdb.drop.batch.sql index 7ef35633e9e..54c1bcdf239 100644 --- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.cockroachdb.drop.batch.sql +++ b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.cockroachdb.drop.batch.sql @@ -1,4 +1,3 @@ drop table if exists flw_ru_batch_part cascade; drop table if exists flw_ru_batch cascade; --- force-commit \ No newline at end of file diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.cockroachdb.create.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.cockroachdb.create.common.sql index 57301f3b630..84db95d9607 100644 --- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.cockroachdb.create.common.sql +++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.cockroachdb.create.common.sql @@ -21,4 +21,3 @@ values ('common.schema.version', '7.0.0.0', 1); insert into ACT_GE_PROPERTY values ('next.dbid', '1', 1); --- force-commit \ No newline at end of file diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.cockroachdb.drop.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.cockroachdb.drop.common.sql index df96f4db2ed..fc5336a7da8 100644 --- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.cockroachdb.drop.common.sql +++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.cockroachdb.drop.common.sql @@ -1,4 +1,3 @@ drop table if exists act_ge_bytearray cascade; drop table if exists act_ge_property cascade; --- force-commit \ No newline at end of file diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.cockroachdb.create.engine.sql b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.cockroachdb.create.engine.sql index 1466594229b..ae32b9395d5 100644 --- a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.cockroachdb.create.engine.sql +++ b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.cockroachdb.create.engine.sql @@ -186,7 +186,7 @@ create index ACT_IDX_MODEL_DEPLOYMENT on ACT_RE_MODEL(DEPLOYMENT_ID_); create index ACT_IDX_PROCDEF_INFO_JSON on ACT_PROCDEF_INFO(INFO_JSON_ID_); create index ACT_IDX_PROCDEF_INFO_PROC on ACT_PROCDEF_INFO(PROC_DEF_ID_); --- force-commit + alter table ACT_GE_BYTEARRAY add constraint ACT_FK_BYTEARR_DEPL diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.cockroachdb.create.history.sql b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.cockroachdb.create.history.sql index 811f232aad8..f1a246f0f8a 100644 --- a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.cockroachdb.create.history.sql +++ b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.cockroachdb.create.history.sql @@ -111,4 +111,4 @@ create index ACT_IDX_HI_IDENT_LNK_TASK on ACT_HI_IDENTITYLINK(TASK_ID_); create index ACT_IDX_HI_IDENT_LNK_PROCINST on ACT_HI_IDENTITYLINK(PROC_INST_ID_); create index ACT_IDX_HI_TASK_INST_PROCINST on ACT_HI_TASKINST(PROC_INST_ID_); --- force-commit + diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/drop/flowable.cockroachdb.drop.engine.sql b/modules/flowable-engine/src/main/resources/org/flowable/db/drop/flowable.cockroachdb.drop.engine.sql index d561db6754b..d5431601169 100644 --- a/modules/flowable-engine/src/main/resources/org/flowable/db/drop/flowable.cockroachdb.drop.engine.sql +++ b/modules/flowable-engine/src/main/resources/org/flowable/db/drop/flowable.cockroachdb.drop.engine.sql @@ -7,4 +7,3 @@ drop table if exists act_evt_log cascade; drop sequence if exists act_evt_log_nr__seq; drop table if exists act_procdef_info cascade; --- force-commit \ No newline at end of file diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/drop/flowable.cockroachdb.drop.history.sql b/modules/flowable-engine/src/main/resources/org/flowable/db/drop/flowable.cockroachdb.drop.history.sql index 0f6d4d75601..912d260b368 100644 --- a/modules/flowable-engine/src/main/resources/org/flowable/db/drop/flowable.cockroachdb.drop.history.sql +++ b/modules/flowable-engine/src/main/resources/org/flowable/db/drop/flowable.cockroachdb.drop.history.sql @@ -4,4 +4,4 @@ drop table if exists act_hi_detail cascade; drop table if exists act_hi_comment cascade; drop table if exists act_hi_attachment cascade; --- force-commit + diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.cockroachdb.create.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.cockroachdb.create.entitylink.history.sql index 3d9df23194b..be58a55a33b 100644 --- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.cockroachdb.create.entitylink.history.sql +++ b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.cockroachdb.create.entitylink.history.sql @@ -21,4 +21,3 @@ create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, RE create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_); create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_); --- force-commit \ No newline at end of file diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.cockroachdb.create.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.cockroachdb.create.entitylink.sql index 7c90eaadcdf..226c905b543 100644 --- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.cockroachdb.create.entitylink.sql +++ b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.cockroachdb.create.entitylink.sql @@ -24,4 +24,3 @@ create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_ insert into ACT_GE_PROPERTY values ('entitylink.schema.version', '7.0.0.0', 1); --- force-commit \ No newline at end of file diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.cockroachdb.drop.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.cockroachdb.drop.entitylink.history.sql index a4a54604f4f..712c91da24a 100644 --- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.cockroachdb.drop.entitylink.history.sql +++ b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.cockroachdb.drop.entitylink.history.sql @@ -1,3 +1,2 @@ drop table if exists act_hi_entitylink cascade; --- force-commit \ No newline at end of file diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.cockroachdb.drop.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.cockroachdb.drop.entitylink.sql index cb994fa7c50..770e3438aa0 100644 --- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.cockroachdb.drop.entitylink.sql +++ b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.cockroachdb.drop.entitylink.sql @@ -1,3 +1,2 @@ drop table if exists act_ru_entitylink cascade; --- force-commit \ No newline at end of file diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.cockroachdb.create.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.cockroachdb.create.identitylink.history.sql index 03ba93cab94..5b2179065a3 100644 --- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.cockroachdb.create.identitylink.history.sql +++ b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.cockroachdb.create.identitylink.history.sql @@ -18,4 +18,3 @@ create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_ create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_); create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); --- force-commit \ No newline at end of file diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.cockroachdb.create.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.cockroachdb.create.identitylink.sql index 48384aba3f9..52f84f8aba6 100644 --- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.cockroachdb.create.identitylink.sql +++ b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.cockroachdb.create.identitylink.sql @@ -22,4 +22,3 @@ create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION insert into ACT_GE_PROPERTY values ('identitylink.schema.version', '7.0.0.0', 1); --- force-commit \ No newline at end of file diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.cockroachdb.drop.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.cockroachdb.drop.identitylink.history.sql index b5b6f2da29b..1fb3c31b3bb 100644 --- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.cockroachdb.drop.identitylink.history.sql +++ b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.cockroachdb.drop.identitylink.history.sql @@ -1,3 +1,2 @@ drop table if exists act_hi_identitylink cascade; --- force-commit \ No newline at end of file diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.cockroachdb.drop.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.cockroachdb.drop.identitylink.sql index b86ebb33620..25ee94c8bbf 100644 --- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.cockroachdb.drop.identitylink.sql +++ b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.cockroachdb.drop.identitylink.sql @@ -1,3 +1,2 @@ drop table if exists act_ru_identitylink cascade; --- force-commit \ No newline at end of file diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.cockroachdb.create.identity.sql b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.cockroachdb.create.identity.sql index dbdd999a2cb..76e6b709e20 100644 --- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.cockroachdb.create.identity.sql +++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.cockroachdb.create.identity.sql @@ -87,7 +87,7 @@ create index ACT_IDX_PRIV_MAPPING on ACT_ID_PRIV_MAPPING(PRIV_ID_); create index ACT_IDX_PRIV_USER on ACT_ID_PRIV_MAPPING(USER_ID_); create index ACT_IDX_PRIV_GROUP on ACT_ID_PRIV_MAPPING(GROUP_ID_); --- force-commit + alter table ACT_ID_MEMBERSHIP add constraint ACT_FK_MEMB_GROUP @@ -108,4 +108,3 @@ alter table ACT_ID_PRIV add constraint ACT_UNIQ_PRIV_NAME unique (NAME_); --- force-commit \ No newline at end of file diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/drop/flowable.cockroachdb.drop.identity.sql b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/drop/flowable.cockroachdb.drop.identity.sql index 9d698ff7a7a..672fce52494 100644 --- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/drop/flowable.cockroachdb.drop.identity.sql +++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/drop/flowable.cockroachdb.drop.identity.sql @@ -8,4 +8,3 @@ drop table if exists act_id_token cascade; drop table if exists act_id_priv cascade; drop table if exists act_id_priv_mapping cascade; --- force-commit \ No newline at end of file diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.cockroachdb.create.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.cockroachdb.create.job.sql index d720ed463ad..3582a65a114 100644 --- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.cockroachdb.create.job.sql +++ b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.cockroachdb.create.job.sql @@ -207,7 +207,7 @@ create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_); create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_); create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); --- force-commit + alter table ACT_RU_JOB add constraint ACT_FK_JOB_EXCEPTION @@ -261,4 +261,3 @@ alter table ACT_RU_EXTERNAL_JOB insert into ACT_GE_PROPERTY values ('job.schema.version', '7.0.0.0', 1); --- force-commit \ No newline at end of file diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.cockroachdb.drop.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.cockroachdb.drop.job.sql index 27bf672c324..ec426707c54 100644 --- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.cockroachdb.drop.job.sql +++ b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.cockroachdb.drop.job.sql @@ -5,4 +5,3 @@ drop table if exists act_ru_deadletter_job cascade; drop table if exists act_ru_history_job cascade; drop table if exists act_ru_external_job cascade; --- force-commit \ No newline at end of file diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.cockroachdb.create.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.cockroachdb.create.task.history.sql index a17916b7da8..4da2d99a808 100644 --- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.cockroachdb.create.task.history.sql +++ b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.cockroachdb.create.task.history.sql @@ -51,4 +51,3 @@ create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_); create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_); create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); --- force-commit \ No newline at end of file diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.cockroachdb.create.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.cockroachdb.create.task.sql index 7cf83bb1060..61c6eeee245 100644 --- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.cockroachdb.create.task.sql +++ b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.cockroachdb.create.task.sql @@ -39,4 +39,3 @@ create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_T insert into ACT_GE_PROPERTY values ('task.schema.version', '7.0.0.0', 1); --- force-commit \ No newline at end of file diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.cockroachdb.drop.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.cockroachdb.drop.task.history.sql index eeea2df3233..851d42d4956 100644 --- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.cockroachdb.drop.task.history.sql +++ b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.cockroachdb.drop.task.history.sql @@ -1,4 +1,3 @@ drop table if exists act_hi_taskinst cascade; drop table if exists act_hi_TSK_log cascade; --- force-commit \ No newline at end of file diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.cockroachdb.drop.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.cockroachdb.drop.task.sql index 8d94749150c..6885aa90bc4 100644 --- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.cockroachdb.drop.task.sql +++ b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.cockroachdb.drop.task.sql @@ -1,3 +1,3 @@ drop table if exists act_ru_task cascade; --- force-commit + diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.cockroachdb.create.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.cockroachdb.create.variable.history.sql index 2dda94d538d..a43c9f718ae 100644 --- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.cockroachdb.create.variable.history.sql +++ b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.cockroachdb.create.variable.history.sql @@ -24,4 +24,3 @@ create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_); create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_); create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_); --- force-commit \ No newline at end of file diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.cockroachdb.create.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.cockroachdb.create.variable.sql index dd9b37db898..929ab789922 100644 --- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.cockroachdb.create.variable.sql +++ b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.cockroachdb.create.variable.sql @@ -22,7 +22,7 @@ create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TY create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_); create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_); --- force-commit + alter table ACT_RU_VARIABLE add constraint ACT_FK_VAR_BYTEARRAY @@ -31,4 +31,4 @@ alter table ACT_RU_VARIABLE insert into ACT_GE_PROPERTY values ('variable.schema.version', '7.0.0.0', 1); --- force-commit + diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.cockroachdb.drop.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.cockroachdb.drop.variable.history.sql index 38cbe2bb8e8..c42f24aceca 100644 --- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.cockroachdb.drop.variable.history.sql +++ b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.cockroachdb.drop.variable.history.sql @@ -1,3 +1,2 @@ drop table if exists act_hi_varinst cascade; --- force-commit \ No newline at end of file diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.cockroachdb.drop.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.cockroachdb.drop.variable.sql index 3a9a774a1da..665ef67f871 100644 --- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.cockroachdb.drop.variable.sql +++ b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.cockroachdb.drop.variable.sql @@ -1,3 +1,2 @@ drop table if exists act_ru_variable cascade; --- force-commit \ No newline at end of file