Skip to content

Commit 3fb7444

Browse files
tijsrademakerstijsrademakers
committed
Fix mapping configuration for new fields
1 parent 07d4617 commit 3fb7444

3 files changed

Lines changed: 22 additions & 10 deletions

File tree

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,9 @@ protected static void addExecutionParams() {
276276
info.addColumn("START_ACT_ID_", "startActivityId", PARAMETER_TYPE_NVARCHAR);
277277
info.addColumn("START_TIME_", "startTime", PARAMETER_TYPE_TIMESTAMP);
278278
info.addColumn("START_USER_ID_", "startUserId", PARAMETER_TYPE_NVARCHAR);
279+
info.addColumn("DUE_DATE_", "dueDate", PARAMETER_TYPE_TIMESTAMP);
280+
info.addColumn("CLAIM_TIME_", "claimTime", PARAMETER_TYPE_TIMESTAMP);
281+
info.addColumn("CLAIMED_BY_", "claimedBy", PARAMETER_TYPE_NVARCHAR);
279282
info.addColumn("IS_COUNT_ENABLED_", "isCountEnabled", PARAMETER_TYPE_BOOLEAN);
280283
info.addColumn("EVT_SUBSCR_COUNT_", "eventSubscriptionCount", PARAMETER_TYPE_INTEGER);
281284
info.addColumn("TASK_COUNT_", "taskCount", PARAMETER_TYPE_INTEGER);
@@ -466,6 +469,9 @@ protected static void addHistoricProcessInstanceParams() {
466469
info.addColumn("START_USER_ID_", "startUserId", PARAMETER_TYPE_NVARCHAR);
467470
info.addColumn("START_ACT_ID_", "startActivityId", PARAMETER_TYPE_NVARCHAR);
468471
info.addColumn("END_ACT_ID_", "endActivityId", PARAMETER_TYPE_NVARCHAR);
472+
info.addColumn("DUE_DATE_", "dueDate", PARAMETER_TYPE_TIMESTAMP);
473+
info.addColumn("CLAIM_TIME_", "claimTime", PARAMETER_TYPE_TIMESTAMP);
474+
info.addColumn("CLAIMED_BY_", "claimedBy", PARAMETER_TYPE_NVARCHAR);
469475
info.addColumn("SUPER_PROCESS_INSTANCE_ID_", "superProcessInstanceId", PARAMETER_TYPE_NVARCHAR);
470476
info.addColumn("DELETE_REASON_", "deleteReason", PARAMETER_TYPE_NVARCHAR);
471477
info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_NVARCHAR);
@@ -899,6 +905,9 @@ protected static void addCaseInstanceParams() {
899905
info.addColumn("IS_COMPLETEABLE_", "completeable", PARAMETER_TYPE_BOOLEAN);
900906
info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_VARCHAR);
901907
info.addColumn("BUSINESS_STATUS_", "businessStatus", PARAMETER_TYPE_NVARCHAR);
908+
info.addColumn("DUE_DATE_", "dueDate", PARAMETER_TYPE_TIMESTAMP);
909+
info.addColumn("CLAIM_TIME_", "claimTime", PARAMETER_TYPE_TIMESTAMP);
910+
info.addColumn("CLAIMED_BY_", "claimedBy", PARAMETER_TYPE_NVARCHAR);
902911
info.addColumn("LOCK_TIME_", "lockTime", PARAMETER_TYPE_TIMESTAMP);
903912
info.addColumn("LOCK_OWNER_", "lockOwner", PARAMETER_TYPE_VARCHAR);
904913
info.addColumn("CaseDefinitionKey", "caseDefinitionKey", PARAMETER_TYPE_VARCHAR);
@@ -1009,6 +1018,9 @@ protected static void addHistoricCaseInstanceParams() {
10091018
info.addColumn("TENANT_ID_", "tenantId", PARAMETER_TYPE_VARCHAR);
10101019
info.addColumn("BUSINESS_STATUS_", "businessStatus", PARAMETER_TYPE_NVARCHAR);
10111020
info.addColumn("END_USER_ID_", "endUserId", PARAMETER_TYPE_VARCHAR);
1021+
info.addColumn("DUE_DATE_", "dueDate", PARAMETER_TYPE_TIMESTAMP);
1022+
info.addColumn("CLAIM_TIME_", "claimTime", PARAMETER_TYPE_TIMESTAMP);
1023+
info.addColumn("CLAIMED_BY_", "claimedBy", PARAMETER_TYPE_NVARCHAR);
10121024
info.addColumn("CaseDefinitionKey", "caseDefinitionKey", PARAMETER_TYPE_VARCHAR);
10131025
info.addColumn("CaseDefinitionName", "caseDefinitionName", PARAMETER_TYPE_NVARCHAR);
10141026
info.addColumn("CaseDefinitionVersion", "caseDefinitionVersion", PARAMETER_TYPE_INTEGER);

‎modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CaseInstance.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#{businessStatus, jdbcType=NVARCHAR},
2626
#{dueDate, jdbcType=TIMESTAMP},
2727
#{claimTime, jdbcType=TIMESTAMP},
28-
#{claimedBy, jdbcType=VARCHAR}
28+
#{claimedBy, jdbcType=NVARCHAR}
2929
)
3030
</insert>
3131

@@ -53,7 +53,7 @@
5353
#{caseInstance.businessStatus, jdbcType=NVARCHAR},
5454
#{caseInstance.dueDate, jdbcType=TIMESTAMP},
5555
#{caseInstance.claimTime, jdbcType=TIMESTAMP},
56-
#{caseInstance.claimedBy, jdbcType=VARCHAR}
56+
#{caseInstance.claimedBy, jdbcType=NVARCHAR}
5757
)
5858
</foreach>
5959
</insert>
@@ -82,7 +82,7 @@
8282
#{caseInstance.businessStatus, jdbcType=NVARCHAR},
8383
#{caseInstance.dueDate, jdbcType=TIMESTAMP},
8484
#{caseInstance.claimTime, jdbcType=TIMESTAMP},
85-
#{caseInstance.claimedBy, jdbcType=VARCHAR}
85+
#{caseInstance.claimedBy, jdbcType=NVARCHAR}
8686
)
8787
</foreach>
8888
SELECT * FROM dual
@@ -147,7 +147,7 @@
147147
CLAIM_TIME_ = #{claimTime, jdbcType=TIMESTAMP},
148148
</if>
149149
<if test="originalPersistentState.claimedBy != claimedBy">
150-
CLAIMED_BY_ = #{claimedBy, jdbcType=VARCHAR},
150+
CLAIMED_BY_ = #{claimedBy, jdbcType=NVARCHAR},
151151
</if>
152152
</set>
153153
where ID_ = #{id, jdbcType=VARCHAR} and REV_ = #{revision, jdbcType=INTEGER}
@@ -202,7 +202,7 @@
202202
<result property="completeable" column="IS_COMPLETEABLE_" jdbcType="BOOLEAN" />
203203
<result property="dueDate" column="DUE_DATE_" jdbcType="TIMESTAMP" />
204204
<result property="claimTime" column="CLAIM_TIME_" jdbcType="TIMESTAMP" />
205-
<result property="claimedBy" column="CLAIMED_BY_" jdbcType="VARCHAR" />
205+
<result property="claimedBy" column="CLAIMED_BY_" jdbcType="NVARCHAR" />
206206
<result property="lockTime" column="LOCK_TIME_" jdbcType="TIMESTAMP" />
207207
<result property="lockOwner" column="LOCK_OWNER_" jdbcType="VARCHAR" />
208208
<result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />

‎modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricCaseInstance.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#{businessStatus, jdbcType=NVARCHAR},
2727
#{dueDate, jdbcType=TIMESTAMP},
2828
#{claimTime, jdbcType=TIMESTAMP},
29-
#{claimedBy, jdbcType=VARCHAR},
29+
#{claimedBy, jdbcType=NVARCHAR},
3030
#{endUserId, jdbcType=VARCHAR}
3131
)
3232
</insert>
@@ -55,7 +55,7 @@
5555
#{historicCaseInstance.businessStatus, jdbcType=NVARCHAR},
5656
#{historicCaseInstance.dueDate, jdbcType=TIMESTAMP},
5757
#{historicCaseInstance.claimTime, jdbcType=TIMESTAMP},
58-
#{historicCaseInstance.claimedBy, jdbcType=VARCHAR},
58+
#{historicCaseInstance.claimedBy, jdbcType=NVARCHAR},
5959
#{historicCaseInstance.endUserId, jdbcType=VARCHAR}
6060
)
6161
</foreach>
@@ -85,7 +85,7 @@
8585
#{historicCaseInstance.businessStatus, jdbcType=NVARCHAR},
8686
#{historicCaseInstance.dueDate, jdbcType=TIMESTAMP},
8787
#{historicCaseInstance.claimTime, jdbcType=TIMESTAMP},
88-
#{historicCaseInstance.claimedBy, jdbcType=VARCHAR},
88+
#{historicCaseInstance.claimedBy, jdbcType=NVARCHAR},
8989
#{historicCaseInstance.endUserId, jdbcType=VARCHAR}
9090
)
9191
</foreach>
@@ -151,7 +151,7 @@
151151
CLAIM_TIME_ = #{claimTime, jdbcType=TIMESTAMP},
152152
</if>
153153
<if test="originalPersistentState.claimedBy != claimedBy">
154-
CLAIMED_BY_ = #{claimedBy, jdbcType=VARCHAR},
154+
CLAIMED_BY_ = #{claimedBy, jdbcType=NVARCHAR},
155155
</if>
156156
<if test="originalPersistentState.endUserId != endUserId">
157157
END_USER_ID_ = #{endUserId, jdbcType=VARCHAR},
@@ -201,7 +201,7 @@
201201
<result property="referenceType" column="REFERENCE_TYPE_" jdbcType="VARCHAR" />
202202
<result property="dueDate" column="DUE_DATE_" jdbcType="TIMESTAMP" />
203203
<result property="claimTime" column="CLAIM_TIME_" jdbcType="TIMESTAMP" />
204-
<result property="claimedBy" column="CLAIMED_BY_" jdbcType="VARCHAR" />
204+
<result property="claimedBy" column="CLAIMED_BY_" jdbcType="NVARCHAR" />
205205
<result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
206206
<result property="endUserId" column="END_USER_ID_" jdbcType="VARCHAR" />
207207

0 commit comments

Comments
 (0)