Merge branch 'main' into flowable-release-7.2.0

flowable · Sep 13, 2024 · dd7da55 · dd7da55
2 parents 291c319 + ced7de5
commit dd7da55
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...src/main/java/org/flowable/common/engine/impl/db/EngineSqlScriptBasedDbSchemaManager.java b/...src/main/java/org/flowable/common/engine/impl/db/EngineSqlScriptBasedDbSchemaManager.java
@@ -213,6 +213,7 @@ protected ChangeLogVersion getChangeLogVersion() {
                             // It is still possible that there are multiple entries with the same DATEEXECUTED value and the order might not be correct.
                             // e.g. MySQL 8.0 sometimes does not return the correct order.
                             changeLogVersion = changeLogVersionId;
+                            latestChangeLogVersionOrder = changeLogVersionOrder;
                         }
                     }
                 }

diff --git a/.../resources/org/flowable/eventsubscription/service/db/mapping/entity/EventSubscription.xml b/.../resources/org/flowable/eventsubscription/service/db/mapping/entity/EventSubscription.xml
@@ -31,7 +31,7 @@
     <result property="lockTime" column="LOCK_TIME_" jdbcType="TIMESTAMP" />
     <result property="lockOwner" column="LOCK_OWNER_" jdbcType="NVARCHAR" />
     <result property="tenantId" column="TENANT_ID_" jdbcType="NVARCHAR" />
-    <discriminator javaType="string" column="EVENT_TYPE_">
+    <discriminator javaType="string" column="EVENT_TYPE_" jdbcType="NVARCHAR">
       <case value="message" resultMap="messageResultMap"/> 
       <case value="signal" resultMap="signalResultMap"/> 
       <case value="compensate" resultMap="compensateResultMap"/>