From fbdc70e0a0a9a22365f06bbe303c44be9e8c3375 Mon Sep 17 00:00:00 2001 From: Fadelis Date: Tue, 25 Feb 2020 10:25:42 +0100 Subject: [PATCH] [#9873] LiquibaseDatabase use correct changeLog table names as they might be overridden --- .../jooq/meta/extensions/liquibase/LiquibaseDatabase.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/liquibase/LiquibaseDatabase.java b/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/liquibase/LiquibaseDatabase.java index 67a73ca360..16f50e5691 100644 --- a/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/liquibase/LiquibaseDatabase.java +++ b/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/liquibase/LiquibaseDatabase.java @@ -77,6 +77,8 @@ public class LiquibaseDatabase extends AbstractInterpretingDatabase { private static final JooqLogger log = JooqLogger.getLogger(LiquibaseDatabase.class); private static final Map SETTERS; private boolean includeLiquibaseTables; + private String databaseChangeLogTableName; + private String databaseChangeLogLockTableName; static { SETTERS = new HashMap<>(); @@ -124,6 +126,9 @@ public class LiquibaseDatabase extends AbstractInterpretingDatabase { } } } + // Retrieve changeLog table names as they might be overridden by configuration setters + databaseChangeLogTableName = database.getDatabaseChangeLogTableName(); + databaseChangeLogLockTableName = database.getDatabaseChangeLogLockTableName(); Liquibase liquibase = new Liquibase(scripts, new FileSystemResourceAccessor(), database); liquibase.update(""); @@ -134,7 +139,7 @@ public class LiquibaseDatabase extends AbstractInterpretingDatabase { List result = new ArrayList<>(super.getTables0()); if (!includeLiquibaseTables) { - List liquibaseTables = Arrays.asList("DATABASECHANGELOG", "DATABASECHANGELOGLOCK"); + List liquibaseTables = Arrays.asList(databaseChangeLogTableName, databaseChangeLogLockTableName); Iterator it = result.iterator(); while (it.hasNext())