From 2d0409df23ecd17608dea4d3fc60188294446094 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Tue, 25 Feb 2020 11:16:10 +0100
Subject: [PATCH] [jOOQ/jOOQ#9872] LiquibaseDatabase should use configured
 changeLogParameters.contexts when updating

---
 .../extensions/liquibase/LiquibaseDatabase.java    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

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 483d6eb210..4012227185 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
@@ -97,8 +97,7 @@ public class LiquibaseDatabase extends AbstractInterpretingDatabase {
     @Override
     protected void export() throws Exception {
         String scripts = getProperties().getProperty("scripts");
-        String liquibaseContexts = getProperties().getProperty("contexts", "");
-        includeLiquibaseTables = Boolean.parseBoolean(getProperties().getProperty("includeLiquibaseTables", "false"));
+        includeLiquibaseTables = Boolean.valueOf(getProperties().getProperty("includeLiquibaseTables", "false"));
 
         if (isBlank(scripts)) {
             scripts = "";
@@ -106,6 +105,7 @@ public class LiquibaseDatabase extends AbstractInterpretingDatabase {
         }
 
         Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(new JdbcConnection(connection()));
+        String contexts = "";
 
         // [#9514] Forward all database.xyz properties to matching Liquibase
         //         Database.setXyz() configuration setter calls
@@ -124,10 +124,18 @@ public class LiquibaseDatabase extends AbstractInterpretingDatabase {
                     log.warn("Configuration error", e.getMessage(), e);
                 }
             }
+
+            // [#9872] Some changeLogParameters can also be passed along
+            if (key.startsWith("changeLogParameters.")) {
+                String property = key.substring("changeLogParameters.".length());
+
+                if ("contexts".equals(property))
+                    contexts = "" + entry.getValue();
+            }
         }
 
         Liquibase liquibase = new Liquibase(scripts, new FileSystemResourceAccessor(), database);
-        liquibase.update(liquibaseContexts);
+        liquibase.update(contexts);
     }
 
     @Override