Skip to content

Commit

Permalink
Fix failing unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbarrez
jbarrez committed Oct 24, 2024
1 parent 1b8fb26 commit 7947515
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 25 deletions.
6 changes: 6 additions & 0 deletions ...le-app-rest/src/test/java/org/flowable/test/persistence/EntityParameterTypesOverview.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ protected static void addActivityInstanceParams() {
info.addColumn("ACT_NAME_", "activityName", PARAMETER_TYPE_NVARCHAR);
info.addColumn("ACT_TYPE_", "activityType", PARAMETER_TYPE_NVARCHAR);
info.addColumn("ASSIGNEE_", "assignee", PARAMETER_TYPE_NVARCHAR);
info.addColumn("COMPLETED_BY_", "completedBy", PARAMETER_TYPE_NVARCHAR);
info.addColumn("START_TIME_", "startTime", PARAMETER_TYPE_TIMESTAMP);
info.addColumn("END_TIME_", "endTime", PARAMETER_TYPE_TIMESTAMP);
info.addColumn("TRANSACTION_ORDER_", "transactionOrder", PARAMETER_TYPE_INTEGER);
Expand Down Expand Up @@ -402,6 +403,7 @@ protected static void addHistoricActivityInstanceParams() {
info.addColumn("ACT_NAME_", "activityName", PARAMETER_TYPE_NVARCHAR);
info.addColumn("ACT_TYPE_", "activityType", PARAMETER_TYPE_NVARCHAR);
info.addColumn("ASSIGNEE_", "assignee", PARAMETER_TYPE_NVARCHAR);
info.addColumn("COMPLETED_BY_", "completedBy", PARAMETER_TYPE_NVARCHAR);
info.addColumn("OWNER_", "owner", PARAMETER_TYPE_NVARCHAR);
info.addColumn("START_TIME_", "startTime", PARAMETER_TYPE_TIMESTAMP);
info.addColumn("END_TIME_", "endTime", PARAMETER_TYPE_TIMESTAMP);
Expand Down Expand Up @@ -1092,6 +1094,8 @@ protected static void addHistoricPlanItemInstanceParams() {
info.addColumn("ENDED_TIME_", "endedTime", PARAMETER_TYPE_TIMESTAMP);
info.addColumn("LAST_UPDATED_TIME_", "lastUpdatedTime", PARAMETER_TYPE_TIMESTAMP);
info.addColumn("START_USER_ID_", "startUserId", PARAMETER_TYPE_VARCHAR);
info.addColumn("ASSIGNEE_", "assignee", PARAMETER_TYPE_NVARCHAR);
info.addColumn("COMPLETED_BY_", "completedBy", PARAMETER_TYPE_NVARCHAR);
info.addColumn("REFERENCE_ID_", "referenceId", PARAMETER_TYPE_VARCHAR);
info.addColumn("REFERENCE_TYPE_", "referenceType", PARAMETER_TYPE_VARCHAR);
info.addColumn("IS_COMPLETEABLE_", "completable", PARAMETER_TYPE_BOOLEAN);
Expand Down Expand Up @@ -1212,6 +1216,8 @@ protected static void addPlanItemInstanceParams() {
info.addColumn("EXIT_TIME_", "exitTime", PARAMETER_TYPE_TIMESTAMP);
info.addColumn("ENDED_TIME_", "endedTime", PARAMETER_TYPE_TIMESTAMP);
info.addColumn("START_USER_ID_", "startUserId", PARAMETER_TYPE_VARCHAR);
info.addColumn("ASSIGNEE_", "assignee", PARAMETER_TYPE_NVARCHAR);
info.addColumn("COMPLETED_BY_", "completedBy", PARAMETER_TYPE_NVARCHAR);
info.addColumn("REFERENCE_ID_", "referenceId", PARAMETER_TYPE_VARCHAR);
info.addColumn("REFERENCE_TYPE_", "referenceType", PARAMETER_TYPE_VARCHAR);
info.addColumn("IS_COMPLETEABLE_", "completable", PARAMETER_TYPE_BOOLEAN);
Expand Down
24 changes: 12 additions & 12 deletions ...ngine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricPlanItemInstance.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
#{endedTime, jdbcType=TIMESTAMP},
#{lastUpdatedTime, jdbcType=TIMESTAMP},
#{startUserId, jdbcType=VARCHAR},
#{assignee, jdbcType=VARCHAR},
#{completedBy, jdbcType=VARCHAR},
#{assignee, jdbcType=NVARCHAR},
#{completedBy, jdbcType=NVARCHAR},
#{referenceId, jdbcType=VARCHAR},
#{referenceType, jdbcType=VARCHAR},
#{entryCriterionId, jdbcType=VARCHAR},
Expand Down Expand Up @@ -80,8 +80,8 @@
#{historicPlanItemInstance.endedTime, jdbcType=TIMESTAMP},
#{historicPlanItemInstance.lastUpdatedTime, jdbcType=TIMESTAMP},
#{historicPlanItemInstance.startUserId, jdbcType=VARCHAR},
#{historicPlanItemInstance.assignee, jdbcType=VARCHAR},
#{historicPlanItemInstance.completedBy, jdbcType=VARCHAR},
#{historicPlanItemInstance.assignee, jdbcType=NVARCHAR},
#{historicPlanItemInstance.completedBy, jdbcType=NVARCHAR},
#{historicPlanItemInstance.referenceId, jdbcType=VARCHAR},
#{historicPlanItemInstance.referenceType, jdbcType=VARCHAR},
#{historicPlanItemInstance.entryCriterionId, jdbcType=VARCHAR},
Expand Down Expand Up @@ -126,8 +126,8 @@
#{historicPlanItemInstance.endedTime, jdbcType=TIMESTAMP},
#{historicPlanItemInstance.lastUpdatedTime, jdbcType=TIMESTAMP},
#{historicPlanItemInstance.startUserId, jdbcType=VARCHAR},
#{historicPlanItemInstance.assignee, jdbcType=VARCHAR},
#{historicPlanItemInstance.completedBy, jdbcType=VARCHAR},
#{historicPlanItemInstance.assignee, jdbcType=NVARCHAR},
#{historicPlanItemInstance.completedBy, jdbcType=NVARCHAR},
#{historicPlanItemInstance.referenceId, jdbcType=VARCHAR},
#{historicPlanItemInstance.referenceType, jdbcType=VARCHAR},
#{historicPlanItemInstance.entryCriterionId, jdbcType=VARCHAR},
Expand Down Expand Up @@ -218,10 +218,10 @@
START_USER_ID_ = #{startUserId, jdbcType=VARCHAR},
</if>
<if test="originalPersistentState.assignee != assignee">
ASSIGNEE_ = #{assignee, jdbcType=VARCHAR},
ASSIGNEE_ = #{assignee, jdbcType=NVARCHAR},
</if>
<if test="originalPersistentState.completedBy != completedBy">
COMPLETED_BY_ = #{completedBy, jdbcType=VARCHAR},
COMPLETED_BY_ = #{completedBy, jdbcType=NVARCHAR},
</if>
<if test="originalPersistentState.referenceId != referenceId">
REFERENCE_ID_ = #{referenceId, jdbcType=VARCHAR},
Expand Down Expand Up @@ -312,8 +312,8 @@
<result property="endedTime" column="ENDED_TIME_" jdbcType="TIMESTAMP"/>
<result property="lastUpdatedTime" column="LAST_UPDATED_TIME_" jdbcType="TIMESTAMP"/>
<result property="startUserId" column="START_USER_ID_" jdbcType="VARCHAR"/>
<result property="assignee" column="ASSIGNEE_" jdbcType="VARCHAR"/>
<result property="completedBy" column="COMPLETED_BY_" jdbcType="VARCHAR"/>
<result property="assignee" column="ASSIGNEE_" jdbcType="NVARCHAR"/>
<result property="completedBy" column="COMPLETED_BY_" jdbcType="NVARCHAR"/>
<result property="referenceId" column="REFERENCE_ID_" jdbcType="VARCHAR"/>
<result property="referenceType" column="REFERENCE_TYPE_" jdbcType="VARCHAR"/>
<result property="entryCriterionId" column="ENTRY_CRITERION_ID_" jdbcType="VARCHAR" />
Expand Down Expand Up @@ -506,10 +506,10 @@
and RES.START_USER_ID_ = #{startUserId, jdbcType=VARCHAR}
</if>
<if test="assignee != null">
and RES.ASSIGNEE_ = #{assignee, jdbcType=VARCHAR}
and RES.ASSIGNEE_ = #{assignee, jdbcType=NVARCHAR}
</if>
<if test="completedBy != null">
and RES.COMPLETED_BY_ = #{completedBy, jdbcType=VARCHAR}
and RES.COMPLETED_BY_ = #{completedBy, jdbcType=NVARCHAR}
</if>
<if test="referenceId != null">
and RES.REFERENCE_ID_ = #{referenceId, jdbcType=VARCHAR}
Expand Down
24 changes: 12 additions & 12 deletions ...e-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/PlanItemInstance.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
#{exitTime, jdbcType=TIMESTAMP},
#{endedTime, jdbcType=TIMESTAMP},
#{startUserId, jdbcType=VARCHAR},
#{assignee, jdbcType=VARCHAR},
#{completedBy, jdbcType=VARCHAR},
#{assignee, jdbcType=NVARCHAR},
#{completedBy, jdbcType=NVARCHAR},
#{referenceId, jdbcType=VARCHAR},
#{referenceType, jdbcType=VARCHAR},
#{completable, jdbcType=BOOLEAN},
Expand Down Expand Up @@ -83,8 +83,8 @@
#{planItemInstance.exitTime, jdbcType=TIMESTAMP},
#{planItemInstance.endedTime, jdbcType=TIMESTAMP},
#{planItemInstance.startUserId, jdbcType=VARCHAR},
#{planItemInstance.assignee, jdbcType=VARCHAR},
#{planItemInstance.completedBy, jdbcType=VARCHAR},
#{planItemInstance.assignee, jdbcType=NVARCHAR},
#{planItemInstance.completedBy, jdbcType=NVARCHAR},
#{planItemInstance.referenceId, jdbcType=VARCHAR},
#{planItemInstance.referenceType, jdbcType=VARCHAR},
#{planItemInstance.completable, jdbcType=BOOLEAN},
Expand Down Expand Up @@ -132,8 +132,8 @@
#{planItemInstance.exitTime, jdbcType=TIMESTAMP},
#{planItemInstance.endedTime, jdbcType=TIMESTAMP},
#{planItemInstance.startUserId, jdbcType=VARCHAR},
#{planItemInstance.assignee, jdbcType=VARCHAR},
#{planItemInstance.completedBy, jdbcType=VARCHAR},
#{planItemInstance.assignee, jdbcType=NVARCHAR},
#{planItemInstance.completedBy, jdbcType=NVARCHAR},
#{planItemInstance.referenceId, jdbcType=VARCHAR},
#{planItemInstance.referenceType, jdbcType=VARCHAR},
#{planItemInstance.completable, jdbcType=BOOLEAN},
Expand Down Expand Up @@ -223,10 +223,10 @@
START_USER_ID_ = #{startUserId, jdbcType=VARCHAR},
</if>
<if test="originalPersistentState.assignee != assignee">
ASSIGNEE_ = #{assignee, jdbcType=VARCHAR},
ASSIGNEE_ = #{assignee, jdbcType=NVARCHAR},
</if>
<if test="originalPersistentState.completedBy != completedBy">
COMPLETED_BY_ = #{completedBy, jdbcType=VARCHAR},
COMPLETED_BY_ = #{completedBy, jdbcType=NVARCHAR},
</if>
<if test="originalPersistentState.referenceId != referenceId">
REFERENCE_ID_ = #{referenceId, jdbcType=VARCHAR},
Expand Down Expand Up @@ -525,10 +525,10 @@
and RES.START_USER_ID_ = #{startUserId, jdbcType=VARCHAR}
</if>
<if test="assignee != null">
and RES.ASSIGNEE_ = #{assignee, jdbcType=VARCHAR}
and RES.ASSIGNEE_ = #{assignee, jdbcType=NVARCHAR}
</if>
<if test="completedBy != null">
and RES.COMPLETED_BY_ = #{completedBy, jdbcType=VARCHAR}
and RES.COMPLETED_BY_ = #{completedBy, jdbcType=NVARCHAR}
</if>
<if test="referenceId != null">
and RES.REFERENCE_ID_ = #{referenceId, jdbcType=VARCHAR}
Expand Down Expand Up @@ -817,10 +817,10 @@
or RES.START_USER_ID_ = #{orQueryObject.startUserId, jdbcType=VARCHAR}
</if>
<if test="orQueryObject.assignee != null">
or RES.ASSIGNEE_ = #{orQueryObject.assignee, jdbcType=VARCHAR}
or RES.ASSIGNEE_ = #{orQueryObject.assignee, jdbcType=NVARCHAR}
</if>
<if test="orQueryObject.completedBy != null">
or RES.COMPLETED_BY_ = #{orQueryObject.completedBy, jdbcType=VARCHAR}
or RES.COMPLETED_BY_ = #{orQueryObject.completedBy, jdbcType=NVARCHAR}
</if>
<if test="orQueryObject.referenceId != null">
or RES.REFERENCE_ID_ = #{orQueryObject.referenceId, jdbcType=VARCHAR}
Expand Down
2 changes: 1 addition & 1 deletion ...es/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/ActivityInstance.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
ACT_NAME_,
ACT_TYPE_,
ASSIGNEE_,
COMPLETED_BY_
COMPLETED_BY_,
START_TIME_,
END_TIME_,
TRANSACTION_ORDER_,
Expand Down

0 comments on commit 7947515

Please sign in to comment.