From 31c16fc36ff153e97eecddd80aa6ffc6255e01de Mon Sep 17 00:00:00 2001
From: Filip Hrisafov <filip.hrisafov@gmail.com>
Date: Mon, 26 Aug 2024 11:09:16 +0200
Subject: [PATCH] Use same SQL as in the ChangeLog.xml and remove the no longer
 needed ChangeLog.xml

The ChangeLog.xml is not needed because we are using the JDBC Connection directly to do the query
---
 .../org/flowable/cmmn/db/mapping/mappings.xml       |  1 -
 .../org/flowable/dmn/db/mapping/mappings.xml        |  1 -
 .../db/EngineSqlScriptBasedDbSchemaManager.java     | 11 +++++++----
 .../org/flowable/common/db/mapping/ChangeLog.xml    | 13 -------------
 .../flowable/eventregistry/db/mapping/mappings.xml  |  1 -
 5 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/ChangeLog.xml

diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/mappings.xml b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/mappings.xml
index 8563d1edf21..44767de5b23 100644
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/mappings.xml
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/mappings.xml
@@ -27,7 +27,6 @@
     <mapper resource="org/flowable/common/db/mapping/entity/Property.xml" />
     <mapper resource="org/flowable/common/db/mapping/entity/ByteArray.xml" />
     <mapper resource="org/flowable/common/db/mapping/entity/TableData.xml" />
-    <mapper resource="org/flowable/common/db/mapping/ChangeLog.xml" />
     <mapper resource="org/flowable/common/db/mapping/common.xml" />
 
     <mapper resource="org/flowable/cmmn/db/mapping/ChangeTenantCmmn.xml" />
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/mappings.xml b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/mappings.xml
index 293de0f36f3..a742e75b3fa 100644
--- a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/mappings.xml
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/mappings.xml
@@ -9,7 +9,6 @@
   <mappers>
     <!-- Common mappers -->
     <mapper resource="org/flowable/common/db/mapping/entity/Property.xml" />
-    <mapper resource="org/flowable/common/db/mapping/ChangeLog.xml" />
     <mapper resource="org/flowable/common/db/mapping/common.xml" />
 
     <mapper resource="org/flowable/dmn/db/mapping/ChangeTenantDmn.xml" />
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 c5a316cb6ee..945e6c53344 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
@@ -198,13 +198,16 @@ protected ChangeLogVersion getChangeLogVersion() {
                 changeLogTableName = prependDatabaseTablePrefix(changeLogTableName);
             }
             try (PreparedStatement statement = databaseConfiguration.getConnection()
-                    .prepareStatement("select ID from " + changeLogTableName + " order by DATEEXECUTED desc")) {
+                    .prepareStatement("select ID from " + changeLogTableName + " order by DATEEXECUTED")) {
+                String changeLogVersion = null;
                 try (ResultSet resultSet = statement.executeQuery()) {
-                    if (resultSet.next()) {
-                        String changeLogVersion = resultSet.getString(1);
-                        return new ChangeLogVersion(changeLogVersion, getDbVersionForChangelogVersion(changeLogVersion));
+                    while (resultSet.next()) {
+                        changeLogVersion = resultSet.getString(1);
                     }
                 }
+                if (changeLogVersion != null) {
+                    return new ChangeLogVersion(changeLogVersion, getDbVersionForChangelogVersion(changeLogVersion));
+                }
             } catch (SQLException e) {
                 throw new RuntimeException("Failed to get change log version from " + changeLogTableName, e);
             }
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/ChangeLog.xml b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/ChangeLog.xml
deleted file mode 100644
index 02c17b226b8..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/ChangeLog.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 
-  
-<mapper namespace="org.flowable.common.engine.impl.persistence.change.ChangeLog">
-
-  <!-- CHANGELOG SELECT -->
-  
-  <select id="selectFlowableChangeLogVersions" parameterType="string" resultType="string">
-    select ID from ${prefix}${changeLogTablePrefix}_DATABASECHANGELOG order by ORDEREXECUTED
-  </select>
-  
-</mapper>
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/mappings.xml b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/mappings.xml
index 93f594dda49..afd26fcafe7 100644
--- a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/mappings.xml
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/mappings.xml
@@ -18,7 +18,6 @@
     <!-- Common mappers -->
     <mapper resource="org/flowable/common/db/mapping/entity/Property.xml" />
     <mapper resource="org/flowable/common/db/mapping/entity/TableData.xml" />
-    <mapper resource="org/flowable/common/db/mapping/ChangeLog.xml" />
     <mapper resource="org/flowable/common/db/mapping/common.xml" />
 
     <!-- Engine mappers -->