Skip to content

Commit 836796e

Browse files
Update activity_id_ column length for event subscription
1 parent ea5bfeb commit 836796e

19 files changed

+235
-123
lines changed

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-cmmn-engine/src/test/java/org/flowable/cmmn/test/eventregistry/CmmnEventRegistryConsumerTest.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@
3838
*/
3939
public class CmmnEventRegistryConsumerTest extends AbstractCmmnEventRegistryConsumerTest {
4040

41+
@Test
42+
@CmmnDeployment
43+
public void testGenericEventListenerNoCorrelationWithLongId() {
44+
CaseInstance caseInstance = cmmnRuntimeService.createCaseInstanceBuilder().caseDefinitionKey("myCase").start();
45+
assertThat(cmmnTaskService.createTaskQuery().caseInstanceId(caseInstance.getId()).list()).hasSize(1);
46+
47+
inboundEventChannelAdapter.triggerTestEvent("test");
48+
assertThat(cmmnTaskService.createTaskQuery().caseInstanceId(caseInstance.getId()).list()).hasSize(2);
49+
}
50+
4151
@Test
4252
@CmmnDeployment
4353
public void testGenericEventListenerNoCorrelation() {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL"
3+
xmlns:flowable="http://flowable.org/cmmn"
4+
targetNamespace="http://flowable.org/cmmn">
5+
<case id="myCase" name="testEventListener">
6+
<casePlanModel id="casePlanModel">
7+
<planItem id="planItemA" name="A" definitionRef="taskA"/>
8+
<planItem id="eventRegistryEventListenerPlanItemWithAVeryLongIdThatExceedsTheDatabaseColumnLimit" definitionRef="eventRegistryEventListenerWithAVeryLongActivityIdThatExceedsTheDatabaseColumnLimit">
9+
<itemControl>
10+
<repetitionRule flowable:counterVariable="repetitionCounter"></repetitionRule>
11+
</itemControl>
12+
</planItem>
13+
<planItem id="planItemB" name="B" definitionRef="taskB">
14+
<itemControl>
15+
<repetitionRule flowable:counterVariable="repetitionCounter"></repetitionRule>
16+
</itemControl>
17+
<entryCriterion id="entryTaskB" sentryRef="sentryOnEventListener"/>
18+
</planItem>
19+
<sentry id="sentryOnEventListener">
20+
<planItemOnPart id="sentryOnEvent" sourceRef="eventRegistryEventListenerPlanItemWithAVeryLongIdThatExceedsTheDatabaseColumnLimit">
21+
<standardEvent>occur</standardEvent>
22+
</planItemOnPart>
23+
</sentry>
24+
<humanTask id="taskA" name="A"/>
25+
<eventListener id="eventRegistryEventListenerWithAVeryLongActivityIdThatExceedsTheDatabaseColumnLimit" name="myEventListener">
26+
<extensionElements>
27+
<flowable:eventType>myEvent</flowable:eventType>
28+
</extensionElements>
29+
</eventListener>
30+
<humanTask id="taskB" name="B"/>
31+
</casePlanModel>
32+
</case>
33+
</definitions>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ create table ACT_RU_EVENT_SUBSCR (
585585
EVENT_NAME_ varchar(255),
586586
EXECUTION_ID_ varchar(64),
587587
PROC_INST_ID_ varchar(64),
588-
ACTIVITY_ID_ varchar(64),
588+
ACTIVITY_ID_ varchar(255),
589589
CONFIGURATION_ varchar(255),
590590
CREATED_ timestamp not null,
591591
PROC_DEF_ID_ varchar(64),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ create table ACT_RU_EVENT_SUBSCR (
114114
EVENT_NAME_ varchar(255),
115115
EXECUTION_ID_ varchar(64),
116116
PROC_INST_ID_ varchar(64),
117-
ACTIVITY_ID_ varchar(64),
117+
ACTIVITY_ID_ varchar(255),
118118
CONFIGURATION_ varchar(255),
119119
CREATED_ timestamp not null,
120120
PROC_DEF_ID_ varchar(64),

modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.hsql.create.common.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ create table ACT_RU_EVENT_SUBSCR (
114114
EVENT_NAME_ varchar(255),
115115
EXECUTION_ID_ varchar(64),
116116
PROC_INST_ID_ varchar(64),
117-
ACTIVITY_ID_ varchar(64),
117+
ACTIVITY_ID_ varchar(255),
118118
CONFIGURATION_ varchar(255),
119119
CREATED_ timestamp not null,
120120
PROC_DEF_ID_ varchar(64),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ create table ACT_RU_EVENT_SUBSCR (
583583
EVENT_NAME_ nvarchar(255),
584584
EXECUTION_ID_ nvarchar(64),
585585
PROC_INST_ID_ nvarchar(64),
586-
ACTIVITY_ID_ nvarchar(64),
586+
ACTIVITY_ID_ nvarchar(255),
587587
CONFIGURATION_ nvarchar(255),
588588
CREATED_ datetime not null,
589589
PROC_DEF_ID_ nvarchar(64),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ create table ACT_RU_EVENT_SUBSCR (
583583
EVENT_NAME_ varchar(255),
584584
EXECUTION_ID_ varchar(64),
585585
PROC_INST_ID_ varchar(64),
586-
ACTIVITY_ID_ varchar(64),
586+
ACTIVITY_ID_ varchar(255),
587587
CONFIGURATION_ varchar(255),
588588
CREATED_ timestamp(3) not null DEFAULT CURRENT_TIMESTAMP(3),
589589
PROC_DEF_ID_ varchar(64),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ create table ACT_RU_EVENT_SUBSCR (
585585
EVENT_NAME_ NVARCHAR2(255),
586586
EXECUTION_ID_ NVARCHAR2(64),
587587
PROC_INST_ID_ NVARCHAR2(64),
588-
ACTIVITY_ID_ NVARCHAR2(64),
588+
ACTIVITY_ID_ NVARCHAR2(255),
589589
CONFIGURATION_ NVARCHAR2(255),
590590
CREATED_ TIMESTAMP(6) not null,
591591
PROC_DEF_ID_ NVARCHAR2(64),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ create table ACT_RU_EVENT_SUBSCR (
582582
EVENT_NAME_ varchar(255),
583583
EXECUTION_ID_ varchar(64),
584584
PROC_INST_ID_ varchar(64),
585-
ACTIVITY_ID_ varchar(64),
585+
ACTIVITY_ID_ varchar(255),
586586
CONFIGURATION_ varchar(255),
587587
CREATED_ timestamp not null,
588588
PROC_DEF_ID_ varchar(64),

0 commit comments

Comments
 (0)