Merge branch 'haltenwe-patch-liquibase#4723' of https://github.com/ha…

…ltenwe/liquibase into haltenwe-haltenwe-patch-liquibase#4723
haltenwe · Sep 15, 2023 · 002df3a · 002df3a
2 parents 85d1a35 + f439be0
commit 002df3a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/liquibase-standard/src/main/java/liquibase/database/core/DB2Database.java b/liquibase-standard/src/main/java/liquibase/database/core/DB2Database.java
@@ -37,7 +37,7 @@ public boolean supportsBooleanDataType() {
 				throw new DatabaseException("Error getting fix pack number");
 
 			return getDatabaseMajorVersion() > 11
-					|| getDatabaseMajorVersion() == 11 && getDatabaseMinorVersion() >= 1 && fixPack.intValue() >= 1;
+                                || getDatabaseMajorVersion() == 11 && ( getDatabaseMinorVersion() == 1 && fixPack.intValue() >= 1 || getDatabaseMinorVersion() > 1 );
 
 		} catch (final DatabaseException e) {
 			return false; // assume not

diff --git a/liquibase-standard/src/main/java/liquibase/lockservice/StandardLockService.java b/liquibase-standard/src/main/java/liquibase/lockservice/StandardLockService.java
@@ -163,7 +163,7 @@ public void init() throws DatabaseException {
 
     private void handleOldChangelogTableFormat(Executor executor) throws DatabaseException {
         if (executor.updatesDatabase() && (database instanceof DerbyDatabase) && ((DerbyDatabase) database)
-                .supportsBooleanDataType() || database.getClass().isAssignableFrom(DB2Database.class) && ((DB2Database) database)
+                .supportsBooleanDataType() || DB2Database.class.isAssignableFrom( database.getClass() ) && ((DB2Database) database)
                 .supportsBooleanDataType()) {
             //check if the changelog table is of an old smallint vs. boolean format
             String lockTable = database.escapeTableName(