Skip to content

Commit 438cd7f

Browse files
Merge branch 'main' of github.com:flowable/flowable-engine into flowable-release-8.1.0
2 parents e2804c3 + 836796e commit 438cd7f

188 files changed

Lines changed: 3196 additions & 320 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

distro/sql/create/all/flowable.db2.all.create.sql

Lines changed: 116 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -958,122 +958,122 @@ insert into ACT_GE_PROPERTY
958958
values ('schema.history', 'create(8.0.0.0)', 1);
959959

960960

961-
create table ACT_HI_PROCINST (
962-
ID_ varchar(64) not null,
963-
REV_ integer default 1,
964-
PROC_INST_ID_ varchar(64) not null,
965-
BUSINESS_KEY_ varchar(255),
966-
PROC_DEF_ID_ varchar(64) not null,
967-
START_TIME_ timestamp not null,
968-
END_TIME_ timestamp,
969-
DURATION_ bigint,
970-
START_USER_ID_ varchar(255),
971-
START_ACT_ID_ varchar(255),
972-
END_ACT_ID_ varchar(255),
973-
SUPER_PROCESS_INSTANCE_ID_ varchar(64),
974-
DELETE_REASON_ varchar(4000),
975-
TENANT_ID_ varchar(255) default '',
976-
NAME_ varchar(255),
977-
CALLBACK_ID_ varchar(255),
978-
CALLBACK_TYPE_ varchar(255),
979-
REFERENCE_ID_ varchar(255),
980-
REFERENCE_TYPE_ varchar(255),
981-
PROPAGATED_STAGE_INST_ID_ varchar(255),
982-
BUSINESS_STATUS_ varchar(255),
983-
END_USER_ID_ varchar(255),
984-
STATE_ varchar(255),
985-
primary key (ID_)
986-
);
987-
988-
alter table ACT_HI_PROCINST add constraint PROC_INST_ID_ unique(PROC_INST_ID_);
989-
990-
create table ACT_HI_ACTINST (
991-
ID_ varchar(64) not null,
992-
REV_ integer default 1,
993-
PROC_DEF_ID_ varchar(64) not null,
994-
PROC_INST_ID_ varchar(64) not null,
995-
EXECUTION_ID_ varchar(64) not null,
996-
ACT_ID_ varchar(255) not null,
997-
TASK_ID_ varchar(64),
998-
CALL_PROC_INST_ID_ varchar(64),
999-
ACT_NAME_ varchar(255),
1000-
ACT_TYPE_ varchar(255) not null,
1001-
ASSIGNEE_ varchar(255),
1002-
COMPLETED_BY_ varchar(255),
1003-
START_TIME_ timestamp not null,
1004-
END_TIME_ timestamp,
1005-
TRANSACTION_ORDER_ integer,
1006-
DURATION_ bigint,
1007-
DELETE_REASON_ varchar(4000),
1008-
TENANT_ID_ varchar(255) default '',
1009-
primary key (ID_)
1010-
);
1011-
1012-
create table ACT_HI_DETAIL (
1013-
ID_ varchar(64) not null,
1014-
TYPE_ varchar(255) not null,
1015-
PROC_INST_ID_ varchar(64),
1016-
EXECUTION_ID_ varchar(64),
1017-
TASK_ID_ varchar(64),
1018-
ACT_INST_ID_ varchar(64),
1019-
NAME_ varchar(255) not null,
1020-
VAR_TYPE_ varchar(255),
1021-
REV_ integer,
1022-
TIME_ timestamp not null,
1023-
BYTEARRAY_ID_ varchar(64),
1024-
DOUBLE_ double precision,
1025-
LONG_ bigint,
1026-
TEXT_ varchar(4000),
1027-
TEXT2_ varchar(4000),
1028-
primary key (ID_)
1029-
);
1030-
1031-
create table ACT_HI_COMMENT (
1032-
ID_ varchar(64) not null,
1033-
TYPE_ varchar(255),
1034-
TIME_ timestamp not null,
1035-
USER_ID_ varchar(255),
1036-
TASK_ID_ varchar(64),
1037-
PROC_INST_ID_ varchar(64),
1038-
ACTION_ varchar(255),
1039-
MESSAGE_ varchar(4000),
1040-
FULL_MSG_ BLOB,
1041-
primary key (ID_)
1042-
);
1043-
1044-
create table ACT_HI_ATTACHMENT (
1045-
ID_ varchar(64) not null,
1046-
REV_ integer,
1047-
USER_ID_ varchar(255),
1048-
NAME_ varchar(255),
1049-
DESCRIPTION_ varchar(4000),
1050-
TYPE_ varchar(255),
1051-
TASK_ID_ varchar(64),
1052-
PROC_INST_ID_ varchar(64),
1053-
URL_ varchar(4000),
1054-
CONTENT_ID_ varchar(64),
1055-
TIME_ timestamp,
1056-
primary key (ID_)
1057-
);
1058-
1059-
create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_);
1060-
create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_);
1061-
create index ACT_IDX_HI_PRO_SUPER_PROCINST on ACT_HI_PROCINST(SUPER_PROCESS_INSTANCE_ID_);
1062-
create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_);
1063-
create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_);
1064-
create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_);
1065-
create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_);
1066-
create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_);
1067-
create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_);
1068-
create index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL(TASK_ID_);
1069-
create index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST(PROC_INST_ID_);
1070-
create index ACT_IDX_HI_PROCVAR_TASK_ID on ACT_HI_VARINST(TASK_ID_);
1071-
create index ACT_IDX_HI_PROCVAR_EXE on ACT_HI_VARINST(EXECUTION_ID_);
1072-
create index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST(PROC_INST_ID_, ACT_ID_);
1073-
create index ACT_IDX_HI_ACT_INST_EXEC on ACT_HI_ACTINST(EXECUTION_ID_, ACT_ID_);
1074-
create index ACT_IDX_HI_IDENT_LNK_TASK on ACT_HI_IDENTITYLINK(TASK_ID_);
1075-
create index ACT_IDX_HI_IDENT_LNK_PROCINST on ACT_HI_IDENTITYLINK(PROC_INST_ID_);
1076-
create index ACT_IDX_HI_TASK_INST_PROCINST on ACT_HI_TASKINST(PROC_INST_ID_);
961+
create table ACT_HI_PROCINST (
962+
ID_ varchar(64) not null,
963+
REV_ integer default 1,
964+
PROC_INST_ID_ varchar(64) not null,
965+
BUSINESS_KEY_ varchar(255),
966+
PROC_DEF_ID_ varchar(64) not null,
967+
START_TIME_ timestamp not null,
968+
END_TIME_ timestamp,
969+
DURATION_ bigint,
970+
START_USER_ID_ varchar(255),
971+
START_ACT_ID_ varchar(255),
972+
END_ACT_ID_ varchar(255),
973+
SUPER_PROCESS_INSTANCE_ID_ varchar(64),
974+
DELETE_REASON_ varchar(4000),
975+
TENANT_ID_ varchar(255) default '',
976+
NAME_ varchar(255),
977+
CALLBACK_ID_ varchar(255),
978+
CALLBACK_TYPE_ varchar(255),
979+
REFERENCE_ID_ varchar(255),
980+
REFERENCE_TYPE_ varchar(255),
981+
PROPAGATED_STAGE_INST_ID_ varchar(255),
982+
BUSINESS_STATUS_ varchar(255),
983+
END_USER_ID_ varchar(255),
984+
STATE_ varchar(255),
985+
primary key (ID_)
986+
);
987+
988+
alter table ACT_HI_PROCINST add constraint PROC_INST_ID_ unique(PROC_INST_ID_);
989+
990+
create table ACT_HI_ACTINST (
991+
ID_ varchar(64) not null,
992+
REV_ integer default 1,
993+
PROC_DEF_ID_ varchar(64) not null,
994+
PROC_INST_ID_ varchar(64) not null,
995+
EXECUTION_ID_ varchar(64) not null,
996+
ACT_ID_ varchar(255) not null,
997+
TASK_ID_ varchar(64),
998+
CALL_PROC_INST_ID_ varchar(64),
999+
ACT_NAME_ varchar(255),
1000+
ACT_TYPE_ varchar(255) not null,
1001+
ASSIGNEE_ varchar(255),
1002+
COMPLETED_BY_ varchar(255),
1003+
START_TIME_ timestamp not null,
1004+
END_TIME_ timestamp,
1005+
TRANSACTION_ORDER_ integer,
1006+
DURATION_ bigint,
1007+
DELETE_REASON_ varchar(4000),
1008+
TENANT_ID_ varchar(255) default '',
1009+
primary key (ID_)
1010+
);
1011+
1012+
create table ACT_HI_DETAIL (
1013+
ID_ varchar(64) not null,
1014+
TYPE_ varchar(255) not null,
1015+
PROC_INST_ID_ varchar(64),
1016+
EXECUTION_ID_ varchar(64),
1017+
TASK_ID_ varchar(64),
1018+
ACT_INST_ID_ varchar(64),
1019+
NAME_ varchar(255) not null,
1020+
VAR_TYPE_ varchar(255),
1021+
REV_ integer,
1022+
TIME_ timestamp not null,
1023+
BYTEARRAY_ID_ varchar(64),
1024+
DOUBLE_ double precision,
1025+
LONG_ bigint,
1026+
TEXT_ varchar(4000),
1027+
TEXT2_ varchar(4000),
1028+
primary key (ID_)
1029+
);
1030+
1031+
create table ACT_HI_COMMENT (
1032+
ID_ varchar(64) not null,
1033+
TYPE_ varchar(255),
1034+
TIME_ timestamp not null,
1035+
USER_ID_ varchar(255),
1036+
TASK_ID_ varchar(64),
1037+
PROC_INST_ID_ varchar(64),
1038+
ACTION_ varchar(255),
1039+
MESSAGE_ varchar(4000),
1040+
FULL_MSG_ BLOB,
1041+
primary key (ID_)
1042+
);
1043+
1044+
create table ACT_HI_ATTACHMENT (
1045+
ID_ varchar(64) not null,
1046+
REV_ integer,
1047+
USER_ID_ varchar(255),
1048+
NAME_ varchar(255),
1049+
DESCRIPTION_ varchar(4000),
1050+
TYPE_ varchar(255),
1051+
TASK_ID_ varchar(64),
1052+
PROC_INST_ID_ varchar(64),
1053+
URL_ varchar(4000),
1054+
CONTENT_ID_ varchar(64),
1055+
TIME_ timestamp,
1056+
primary key (ID_)
1057+
);
1058+
1059+
create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_);
1060+
create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_);
1061+
create index ACT_IDX_HI_PRO_SUPER_PROCINST on ACT_HI_PROCINST(SUPER_PROCESS_INSTANCE_ID_);
1062+
create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_);
1063+
create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_);
1064+
create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_);
1065+
create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_);
1066+
create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_);
1067+
create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_);
1068+
create index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL(TASK_ID_);
1069+
create index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST(PROC_INST_ID_);
1070+
create index ACT_IDX_HI_PROCVAR_TASK_ID on ACT_HI_VARINST(TASK_ID_);
1071+
create index ACT_IDX_HI_PROCVAR_EXE on ACT_HI_VARINST(EXECUTION_ID_);
1072+
create index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST(PROC_INST_ID_, ACT_ID_);
1073+
create index ACT_IDX_HI_ACT_INST_EXEC on ACT_HI_ACTINST(EXECUTION_ID_, ACT_ID_);
1074+
create index ACT_IDX_HI_IDENT_LNK_TASK on ACT_HI_IDENTITYLINK(TASK_ID_);
1075+
create index ACT_IDX_HI_IDENT_LNK_PROCINST on ACT_HI_IDENTITYLINK(PROC_INST_ID_);
1076+
create index ACT_IDX_HI_TASK_INST_PROCINST on ACT_HI_TASKINST(PROC_INST_ID_);
10771077

10781078

10791079
CREATE TABLE ACT_APP_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), KEY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_APP_DEPLOY PRIMARY KEY (ID_));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
1515
CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
1616

1717
insert into ACT_GE_PROPERTY
18-
values ('app.schema.version', '8.0.0.0', 1);
18+
values ('app.schema.version', '8.1.0.0', 1);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
1515
CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
1616

1717
insert into ACT_GE_PROPERTY
18-
values ('app.schema.version', '8.0.0.0', 1);
18+
values ('app.schema.version', '8.1.0.0', 1);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ CREATE NONCLUSTERED INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_)
1515
CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
1616

1717
insert into ACT_GE_PROPERTY
18-
values ('app.schema.version', '8.0.0.0', 1);
18+
values ('app.schema.version', '8.1.0.0', 1);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ ALTER TABLE ACT_APP_DEPLOYMENT MODIFY DEPLOY_TIME_ datetime(3);
1717
CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
1818

1919
insert into ACT_GE_PROPERTY
20-
values ('app.schema.version', '8.0.0.0', 1);
20+
values ('app.schema.version', '8.1.0.0', 1);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
1515
CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
1616

1717
insert into ACT_GE_PROPERTY
18-
values ('app.schema.version', '8.0.0.0', 1);
18+
values ('app.schema.version', '8.1.0.0', 1);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
1515
CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
1616

1717
insert into ACT_GE_PROPERTY
18-
values ('app.schema.version', '8.0.0.0', 1);
18+
values ('app.schema.version', '8.1.0.0', 1);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
update ACT_GE_PROPERTY set VALUE_ = '8.1.0.0' where NAME_ = 'app.schema.version';

modules/flowable-app-rest/src/test/java/org/flowable/test/persistence/EntityParameterTypesOverview.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,6 +1108,7 @@ protected static void addHistoricPlanItemInstanceParams() {
11081108
info.addColumn("COMPLETED_TIME_", "completedTime", PARAMETER_TYPE_TIMESTAMP);
11091109
info.addColumn("OCCURRED_TIME_", "occurredTime", PARAMETER_TYPE_TIMESTAMP);
11101110
info.addColumn("TERMINATED_TIME_", "terminatedTime", PARAMETER_TYPE_TIMESTAMP);
1111+
info.addColumn("FAILED_TIME_", "failedTime", PARAMETER_TYPE_TIMESTAMP);
11111112
info.addColumn("EXIT_TIME_", "exitTime", PARAMETER_TYPE_TIMESTAMP);
11121113
info.addColumn("ENDED_TIME_", "endedTime", PARAMETER_TYPE_TIMESTAMP);
11131114
info.addColumn("LAST_UPDATED_TIME_", "lastUpdatedTime", PARAMETER_TYPE_TIMESTAMP);
@@ -1171,6 +1172,8 @@ protected static void addHistoricPlanItemInstanceParams() {
11711172
info.addQueryParameter("occurredAfter", PARAMETER_TYPE_TIMESTAMP);
11721173
info.addQueryParameter("terminatedBefore", PARAMETER_TYPE_TIMESTAMP);
11731174
info.addQueryParameter("terminatedAfter", PARAMETER_TYPE_TIMESTAMP);
1175+
info.addQueryParameter("failedBefore", PARAMETER_TYPE_TIMESTAMP);
1176+
info.addQueryParameter("failedAfter", PARAMETER_TYPE_TIMESTAMP);
11741177
info.addQueryParameter("exitBefore", PARAMETER_TYPE_TIMESTAMP);
11751178
info.addQueryParameter("exitAfter", PARAMETER_TYPE_TIMESTAMP);
11761179
info.addQueryParameter("endedBefore", PARAMETER_TYPE_TIMESTAMP);
@@ -1232,6 +1235,7 @@ protected static void addPlanItemInstanceParams() {
12321235
info.addColumn("COMPLETED_TIME_", "completedTime", PARAMETER_TYPE_TIMESTAMP);
12331236
info.addColumn("OCCURRED_TIME_", "occurredTime", PARAMETER_TYPE_TIMESTAMP);
12341237
info.addColumn("TERMINATED_TIME_", "terminatedTime", PARAMETER_TYPE_TIMESTAMP);
1238+
info.addColumn("FAILED_TIME_", "failedTime", PARAMETER_TYPE_TIMESTAMP);
12351239
info.addColumn("EXIT_TIME_", "exitTime", PARAMETER_TYPE_TIMESTAMP);
12361240
info.addColumn("ENDED_TIME_", "endedTime", PARAMETER_TYPE_TIMESTAMP);
12371241
info.addColumn("START_USER_ID_", "startUserId", PARAMETER_TYPE_VARCHAR);
@@ -1295,6 +1299,8 @@ protected static void addPlanItemInstanceParams() {
12951299
info.addQueryParameter("occurredAfter", PARAMETER_TYPE_TIMESTAMP);
12961300
info.addQueryParameter("terminatedBefore", PARAMETER_TYPE_TIMESTAMP);
12971301
info.addQueryParameter("terminatedAfter", PARAMETER_TYPE_TIMESTAMP);
1302+
info.addQueryParameter("failedBefore", PARAMETER_TYPE_TIMESTAMP);
1303+
info.addQueryParameter("failedAfter", PARAMETER_TYPE_TIMESTAMP);
12981304
info.addQueryParameter("exitBefore", PARAMETER_TYPE_TIMESTAMP);
12991305
info.addQueryParameter("exitAfter", PARAMETER_TYPE_TIMESTAMP);
13001306
info.addQueryParameter("endedBefore", PARAMETER_TYPE_TIMESTAMP);

modules/flowable-camel/src/main/java/org/flowable/camel/CamelBehavior.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.flowable.common.engine.api.delegate.Expression;
2828
import org.flowable.common.engine.impl.context.Context;
2929
import org.flowable.engine.compatibility.Flowable5CompatibilityHandler;
30+
import org.flowable.common.engine.api.delegate.BusinessError;
3031
import org.flowable.engine.delegate.BpmnError;
3132
import org.flowable.engine.delegate.DelegateExecution;
3233
import org.flowable.engine.impl.bpmn.behavior.AbstractBpmnActivityBehavior;
@@ -171,13 +172,13 @@ protected boolean handleCamelException(Exchange exchange, DelegateExecution exec
171172
Exception camelException = exchange.getException();
172173
boolean notHandledByCamel = exchange.isFailed() && camelException != null;
173174
if (notHandledByCamel) {
174-
if (camelException instanceof BpmnError) {
175+
if (camelException instanceof BusinessError) {
175176
if (isV5Execution) {
176177
Flowable5CompatibilityHandler compatibilityHandler = Flowable5Util.getFlowable5CompatibilityHandler();
177178
compatibilityHandler.propagateError((BpmnError) camelException, execution);
178179
return true;
179180
}
180-
ErrorPropagation.propagateError((BpmnError) camelException, execution);
181+
ErrorPropagation.propagateError((BusinessError) camelException, execution);
181182
return true;
182183
} else {
183184
if (isV5Execution) {

0 commit comments

Comments
 (0)