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
flowable · Aug 26, 2024 · 31c16fc · 31c16fc
1 parent e595ea5
commit 31c16fc
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 20 deletions.
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
@@ -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
@@ -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/...src/main/java/org/flowable/common/engine/impl/db/EngineSqlScriptBasedDbSchemaManager.java b/...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/...es/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/ChangeLog.xml b/...es/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/ChangeLog.xml
diff --git a/...able-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/mappings.xml b/...able-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 -->