Skip to content

Commit 31c16fc

Browse files
committed
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
1 parent e595ea5 commit 31c16fc

File tree

5 files changed

+7
-20
lines changed

5 files changed

+7
-20
lines changed

modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/mappings.xml

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<mapper resource="org/flowable/common/db/mapping/entity/Property.xml" />
2828
<mapper resource="org/flowable/common/db/mapping/entity/ByteArray.xml" />
2929
<mapper resource="org/flowable/common/db/mapping/entity/TableData.xml" />
30-
<mapper resource="org/flowable/common/db/mapping/ChangeLog.xml" />
3130
<mapper resource="org/flowable/common/db/mapping/common.xml" />
3231

3332
<mapper resource="org/flowable/cmmn/db/mapping/ChangeTenantCmmn.xml" />

modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/mappings.xml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<mappers>
1010
<!-- Common mappers -->
1111
<mapper resource="org/flowable/common/db/mapping/entity/Property.xml" />
12-
<mapper resource="org/flowable/common/db/mapping/ChangeLog.xml" />
1312
<mapper resource="org/flowable/common/db/mapping/common.xml" />
1413

1514
<mapper resource="org/flowable/dmn/db/mapping/ChangeTenantDmn.xml" />

modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/EngineSqlScriptBasedDbSchemaManager.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -198,13 +198,16 @@ protected ChangeLogVersion getChangeLogVersion() {
198198
changeLogTableName = prependDatabaseTablePrefix(changeLogTableName);
199199
}
200200
try (PreparedStatement statement = databaseConfiguration.getConnection()
201-
.prepareStatement("select ID from " + changeLogTableName + " order by DATEEXECUTED desc")) {
201+
.prepareStatement("select ID from " + changeLogTableName + " order by DATEEXECUTED")) {
202+
String changeLogVersion = null;
202203
try (ResultSet resultSet = statement.executeQuery()) {
203-
if (resultSet.next()) {
204-
String changeLogVersion = resultSet.getString(1);
205-
return new ChangeLogVersion(changeLogVersion, getDbVersionForChangelogVersion(changeLogVersion));
204+
while (resultSet.next()) {
205+
changeLogVersion = resultSet.getString(1);
206206
}
207207
}
208+
if (changeLogVersion != null) {
209+
return new ChangeLogVersion(changeLogVersion, getDbVersionForChangelogVersion(changeLogVersion));
210+
}
208211
} catch (SQLException e) {
209212
throw new RuntimeException("Failed to get change log version from " + changeLogTableName, e);
210213
}

modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/ChangeLog.xml

-13
This file was deleted.

modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/mappings.xml

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<!-- Common mappers -->
1919
<mapper resource="org/flowable/common/db/mapping/entity/Property.xml" />
2020
<mapper resource="org/flowable/common/db/mapping/entity/TableData.xml" />
21-
<mapper resource="org/flowable/common/db/mapping/ChangeLog.xml" />
2221
<mapper resource="org/flowable/common/db/mapping/common.xml" />
2322

2423
<!-- Engine mappers -->

0 commit comments

Comments
 (0)