From 3e2eab8a367da23d2b44041d576a4ca8827fe3cb Mon Sep 17 00:00:00 2001
From: Filip Hrisafov <filip.hrisafov@gmail.com>
Date: Thu, 12 Sep 2024 09:26:48 +0200
Subject: [PATCH 1/3] Make sure that the latestChangeLogVersionOrder is
 properly updated

---
 .../engine/impl/db/EngineSqlScriptBasedDbSchemaManager.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/EngineSqlScriptBasedDbSchemaManager.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/EngineSqlScriptBasedDbSchemaManager.java
index e85c4ea2469..a901834b40b 100644
--- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/EngineSqlScriptBasedDbSchemaManager.java
+++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/EngineSqlScriptBasedDbSchemaManager.java
@@ -214,6 +214,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;
                         }
                     }
                 }

From c430cc30b5c8d1e8d83e754f6bb2b11d8a0ec8a7 Mon Sep 17 00:00:00 2001
From: Filip Hrisafov <filip.hrisafov@gmail.com>
Date: Fri, 13 Sep 2024 13:44:15 +0200
Subject: [PATCH 2/3] Add jdbcType for event subscription discriminator

---
 .../service/db/mapping/entity/EventSubscription.xml             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/mapping/entity/EventSubscription.xml b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/mapping/entity/EventSubscription.xml
index 05ebe301d15..dec505c84ba 100644
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/mapping/entity/EventSubscription.xml
+++ b/modules/flowable-eventsubscription-service/src/main/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"/>

From ced7de50613b34c39febdaf078b4f1b31d073bd2 Mon Sep 17 00:00:00 2001
From: Filip Hrisafov <filip.hrisafov@gmail.com>
Date: Fri, 13 Sep 2024 13:44:34 +0200
Subject: [PATCH 3/3] Remove incorrect line from SchemaOperationsEngineBuild

---
 .../common/engine/impl/db/SchemaOperationsEngineBuild.java       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/SchemaOperationsEngineBuild.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/SchemaOperationsEngineBuild.java
index d6fe9c1fcf1..6138f013b6d 100644
--- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/SchemaOperationsEngineBuild.java
+++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/SchemaOperationsEngineBuild.java
@@ -54,7 +54,6 @@ public Void execute(CommandContext commandContext) {
 
         String databaseSchemaUpdate = schemaOperation == null ? engineConfiguration.getDatabaseSchemaUpdate() : schemaOperation;
         List<SchemaManager> schemaManagers = new ArrayList<>();
-        schemaManagers.add(engineConfiguration.getCommonSchemaManager());
         if (engineConfiguration.getCommonSchemaManager() != null) {
         	schemaManagers.add(engineConfiguration.getCommonSchemaManager());
         }