[#9866] Liquibase imports should use ClassLoaderResourceAccessor

jOOQ · Feb 25, 2020 · 41a64fc · 41a64fc
1 parent 5de3cfd
commit 41a64fc
Showing 1 changed file with 14 additions and 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
@@ -58,6 +58,8 @@
 import liquibase.database.Database;
 import liquibase.database.DatabaseFactory;
 import liquibase.database.jvm.JdbcConnection;
+import liquibase.resource.ClassLoaderResourceAccessor;
+import liquibase.resource.CompositeResourceAccessor;
 import liquibase.resource.FileSystemResourceAccessor;
 
 /**
@@ -135,11 +137,22 @@ else if (key.startsWith("changeLogParameters.")) {
                     contexts = "" + entry.getValue();
             }
         }
+
         // 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);
+        // [#9866] Allow for loading included files from the classpath or using absolute paths.
+        Liquibase liquibase = new Liquibase(
+            scripts,
+            new CompositeResourceAccessor(
+                new FileSystemResourceAccessor(),
+                new ClassLoaderResourceAccessor(),
+                new ClassLoaderResourceAccessor(Thread.currentThread().getContextClassLoader())
+            ),
+            database
+        );
+
         liquibase.update(contexts);
     }