Merge main into branch

Author: tijsrademakers

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/drop/flowable.db2.drop.app.sql

@@ -8,3 +8,5 @@ alter table ACT_APP_APPDEF
 drop table ACT_APP_APPDEF;
 drop table ACT_APP_DEPLOYMENT_RESOURCE;
 drop table ACT_APP_DEPLOYMENT;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'app.schema.version';

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/drop/flowable.h2.drop.app.sql

@@ -5,3 +5,5 @@ drop table if exists ACT_APP_DEPLOYMENT cascade constraints;
 drop index if exists ACT_IDX_APP_RSRC_DPL;
 drop index if exists ACT_IDX_APP_DEF_DPLY;
 drop index if exists ACT_IDX_APP_DEF_UNIQ;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'app.schema.version';

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/drop/flowable.mssql.drop.app.sql

@@ -6,3 +6,5 @@ if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = '
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_APP_APPDEF') drop table ACT_APP_APPDEF;
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_APP_DEPLOYMENT_RESOURCE') drop table ACT_APP_DEPLOYMENT_RESOURCE;
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_APP_DEPLOYMENT') drop table ACT_APP_DEPLOYMENT;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'app.schema.version';

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/drop/flowable.mysql.drop.app.sql

@@ -8,3 +8,5 @@ alter table ACT_APP_APPDEF
 drop table if exists ACT_APP_APPDEF;
 drop table if exists ACT_APP_DEPLOYMENT_RESOURCE;
 drop table if exists ACT_APP_DEPLOYMENT;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'app.schema.version';

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/drop/flowable.oracle.drop.app.sql

@@ -8,3 +8,5 @@ alter table ACT_APP_APPDEF
 drop table ACT_APP_APPDEF;
 drop table ACT_APP_DEPLOYMENT_RESOURCE;
 drop table ACT_APP_DEPLOYMENT;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'app.schema.version';

modules/flowable-app-engine/src/main/resources/org/flowable/app/db/drop/flowable.postgres.drop.app.sql

@@ -1,3 +1,5 @@
 drop table if exists ACT_APP_APPDEF cascade;
 drop table if exists ACT_APP_DEPLOYMENT_RESOURCE cascade;
 drop table if exists ACT_APP_DEPLOYMENT cascade;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'app.schema.version';

modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/drop/flowable.db2.drop.cmmn.sql

@@ -35,4 +35,6 @@ drop table ACT_CMMN_RU_PLAN_ITEM_INST;
 drop table ACT_CMMN_RU_CASE_INST;
 drop table ACT_CMMN_CASEDEF;
 drop table ACT_CMMN_DEPLOYMENT_RESOURCE;
-drop table ACT_CMMN_DEPLOYMENT;
+drop table ACT_CMMN_DEPLOYMENT;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'cmmn.schema.version';

modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/drop/flowable.hsql.drop.cmmn.sql

@@ -25,3 +25,5 @@ drop index if exists ACT_IDX_CASE_INST_PARENT;
 drop index if exists ACT_IDX_CASE_INST_CASE_DEF;
 drop index if exists ACT_IDX_CASE_DEF_DPLY;
 drop index if exists ACT_IDX_CMMN_RSRC_DPL;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'cmmn.schema.version';

modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/drop/flowable.mssql.drop.cmmn.sql

@@ -35,4 +35,6 @@ if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = '
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_CMMN_RU_CASE_INST') drop table ACT_CMMN_RU_CASE_INST;
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_CMMN_CASEDEF') drop table ACT_CMMN_CASEDEF;
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_CMMN_DEPLOYMENT_RESOURCE') drop table ACT_CMMN_DEPLOYMENT_RESOURCE;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_CMMN_DEPLOYMENT') drop table ACT_CMMN_DEPLOYMENT;
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_CMMN_DEPLOYMENT') drop table ACT_CMMN_DEPLOYMENT;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'cmmn.schema.version';

modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/drop/flowable.mysql.drop.cmmn.sql

@@ -35,4 +35,6 @@ drop table if exists ACT_CMMN_RU_PLAN_ITEM_INST;
 drop table if exists ACT_CMMN_RU_CASE_INST;
 drop table if exists ACT_CMMN_CASEDEF;
 drop table if exists ACT_CMMN_DEPLOYMENT_RESOURCE;
-drop table if exists ACT_CMMN_DEPLOYMENT;
+drop table if exists ACT_CMMN_DEPLOYMENT;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'cmmn.schema.version';

modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/drop/flowable.oracle.drop.cmmn.sql

@@ -35,4 +35,6 @@ drop table ACT_CMMN_RU_PLAN_ITEM_INST;
 drop table ACT_CMMN_RU_CASE_INST;
 drop table ACT_CMMN_CASEDEF;
 drop table ACT_CMMN_DEPLOYMENT_RESOURCE;
-drop table ACT_CMMN_DEPLOYMENT;
+drop table ACT_CMMN_DEPLOYMENT;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'cmmn.schema.version';

modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/drop/flowable.postgres.drop.cmmn.sql

@@ -7,4 +7,6 @@ drop table ACT_CMMN_RU_PLAN_ITEM_INST cascade;
 drop table ACT_CMMN_RU_CASE_INST cascade;
 drop table ACT_CMMN_CASEDEF cascade;
 drop table ACT_CMMN_DEPLOYMENT_RESOURCE cascade;
-drop table ACT_CMMN_DEPLOYMENT cascade;
+drop table ACT_CMMN_DEPLOYMENT cascade;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'cmmn.schema.version';

modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.db2.drop.dmn.sql

@@ -5,3 +5,5 @@ drop table ACT_DMN_HI_DECISION_EXECUTION;
 drop table ACT_DMN_DECISION;
 drop table ACT_DMN_DEPLOYMENT_RESOURCE;
 drop table ACT_DMN_DEPLOYMENT;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'dmn.schema.version';

modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.h2.drop.dmn.sql

@@ -5,3 +5,5 @@ drop table if exists ACT_DMN_DEPLOYMENT cascade constraints;
 
 drop index if exists ACT_IDX_DMN_INSTANCE_ID;
 drop index if exists ACT_IDX_DMN_DEC_UNIQ;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'dmn.schema.version';

modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.mssql.drop.dmn.sql

@@ -5,3 +5,5 @@ if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = '
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_DMN_DECISION') drop table ACT_DMN_DECISION;
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_DMN_DEPLOYMENT_RESOURCE') drop table ACT_DMN_DEPLOYMENT_RESOURCE;
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_DMN_DEPLOYMENT') drop table ACT_DMN_DEPLOYMENT;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'dmn.schema.version';

modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.mysql.drop.dmn.sql

@@ -5,3 +5,5 @@ drop table if exists ACT_DMN_HI_DECISION_EXECUTION;
 drop table if exists ACT_DMN_DECISION;
 drop table if exists ACT_DMN_DEPLOYMENT_RESOURCE;
 drop table if exists ACT_DMN_DEPLOYMENT;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'dmn.schema.version';

modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.oracle.drop.dmn.sql

@@ -5,3 +5,5 @@ drop table ACT_DMN_HI_DECISION_EXECUTION;
 drop table ACT_DMN_DECISION;
 drop table ACT_DMN_DEPLOYMENT_RESOURCE;
 drop table ACT_DMN_DEPLOYMENT;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'dmn.schema.version';

modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.postgres.drop.dmn.sql

@@ -2,3 +2,5 @@ drop table if exists ACT_DMN_HI_DECISION_EXECUTION cascade;
 drop table if exists ACT_DMN_DECISION cascade;
 drop table if exists ACT_DMN_DEPLOYMENT_RESOURCE cascade;
 drop table if exists ACT_DMN_DEPLOYMENT cascade;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'dmn.schema.version';

modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.mysql.drop.common.sql

@@ -106,6 +106,42 @@ drop index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB;
 drop index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB;
 drop index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB;
 
+drop index ACT_IDX_JOB_EXCEPTION_STACK_ID on ACT_RU_JOB;
+drop index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB;
+drop index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB;
+drop index ACT_IDX_JOB_SCOPE on ACT_RU_JOB;
+drop index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB;
+drop index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB;
+
+drop index ACT_IDX_TIMER_JOB_EXCEPTION_STACK_ID on ACT_RU_TIMER_JOB;
+drop index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB;
+drop index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB;
+drop index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB;
+drop index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB;
+drop index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB;
+drop index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB;
+
+drop index ACT_IDX_SUSPENDED_JOB_EXCEPTION_STACK_ID on ACT_RU_SUSPENDED_JOB;
+drop index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB;
+drop index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB;
+drop index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB;
+drop index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB;
+drop index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB;
+
+drop index ACT_IDX_DEADLETTER_JOB_EXCEPTION_STACK_ID on ACT_RU_DEADLETTER_JOB;
+drop index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB;
+drop index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB;
+drop index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB;
+drop index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB;
+drop index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB;
+
+drop index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB;
+drop index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB;
+drop index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB;
+drop index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB;
+drop index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB;
+drop index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB;
+
 drop table if exists ACT_RU_JOB;
 drop table if exists ACT_RU_TIMER_JOB;
 drop table if exists ACT_RU_SUSPENDED_JOB;

modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.db2.drop.eventregistry.sql

@@ -5,3 +5,5 @@ drop table FLW_CHANNEL_DEFINITION;
 drop table FLW_EVENT_DEFINITION;
 drop table FLW_EVENT_RESOURCE;
 drop table FLW_EVENT_DEPLOYMENT;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'eventregistry.schema.version';

modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.h2.drop.eventregistry.sql

@@ -5,3 +5,5 @@ drop table if exists FLW_CHANNEL_DEFINITION cascade constraints;
 drop table if exists FLW_EVENT_DEFINITION cascade constraints;
 drop table if exists FLW_EVENT_RESOURCE cascade constraints;
 drop table if exists FLW_EVENT_DEPLOYMENT cascade constraints;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'eventregistry.schema.version';

modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.mssql.drop.eventregistry.sql

@@ -4,4 +4,6 @@ IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_EVENT_DEF_UNIQ') dr
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'FLW_CHANNEL_DEFINITION') drop table FLW_CHANNEL_DEFINITION;
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'FLW_EVENT_DEFINITION') drop table FLW_EVENT_DEFINITION;
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'FLW_EVENT_RESOURCE') drop table FLW_EVENT_RESOURCE;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'FLW_EVENT_DEPLOYMENT') drop table FLW_EVENT_DEPLOYMENT;
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'FLW_EVENT_DEPLOYMENT') drop table FLW_EVENT_DEPLOYMENT;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'eventregistry.schema.version';

modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.mysql.drop.eventregistry.sql

@@ -5,3 +5,5 @@ drop table if exists FLW_CHANNEL_DEFINITION;
 drop table if exists FLW_EVENT_DEFINITION;
 drop table if exists FLW_EVENT_RESOURCE;
 drop table if exists FLW_EVENT_DEPLOYMENT;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'eventregistry.schema.version';

modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.oracle.drop.eventregistry.sql

@@ -5,3 +5,5 @@ drop table FLW_CHANNEL_DEFINITION;
 drop table FLW_EVENT_DEFINITION;
 drop table FLW_EVENT_RESOURCE;
 drop table FLW_EVENT_DEPLOYMENT;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'eventregistry.schema.version';

modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.postgres.drop.eventregistry.sql

@@ -2,3 +2,5 @@ drop table if exists FLW_CHANNEL_DEFINITION cascade;
 drop table if exists FLW_EVENT_DEFINITION cascade;
 drop table if exists FLW_EVENT_RESOURCE cascade;
 drop table if exists FLW_EVENT_DEPLOYMENT cascade;
+
+delete from ACT_GE_PROPERTY where NAME_ = 'eventregistry.schema.version';