diff --git a/pom.xml b/pom.xml index 204eca057..a31d5a5b8 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ io.ebean ebean-dbmigration - 10.1.8 + 10.1.9 @@ -130,7 +130,7 @@ org.postgresql postgresql - 9.4.1212.jre7 + 42.1.1.jre7 provided diff --git a/src/main/java/io/ebean/config/DbMigrationConfig.java b/src/main/java/io/ebean/config/DbMigrationConfig.java index ca236cd32..ba9dcd38c 100644 --- a/src/main/java/io/ebean/config/DbMigrationConfig.java +++ b/src/main/java/io/ebean/config/DbMigrationConfig.java @@ -7,6 +7,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Map; +import java.util.Properties; /** * Configuration for the DB migration processing. @@ -443,7 +444,7 @@ public class DbMigrationConfig { /** * Create the MigrationRunner to run migrations if necessary. */ - public MigrationRunner createRunner(ClassLoader classLoader) { + public MigrationRunner createRunner(ClassLoader classLoader, Properties properties) { MigrationConfig runnerConfig = new MigrationConfig(); runnerConfig.setMetaTable(metaTable); @@ -454,6 +455,9 @@ public class DbMigrationConfig { runnerConfig.setDbUsername(getDbUsername()); runnerConfig.setDbPassword(getDbPassword()); runnerConfig.setClassLoader(classLoader); + if (properties != null) { + runnerConfig.load(properties); + } return new MigrationRunner(runnerConfig); } } diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java index c36612208..04f3e0810 100644 --- a/src/main/java/io/ebean/config/ServerConfig.java +++ b/src/main/java/io/ebean/config/ServerConfig.java @@ -2755,7 +2755,7 @@ public class ServerConfig { */ public DataSource runDbMigration(DataSource dataSource) { if (migrationConfig.isRunMigration()) { - MigrationRunner runner = migrationConfig.createRunner(getClassLoadConfig().getClassLoader()); + MigrationRunner runner = migrationConfig.createRunner(getClassLoadConfig().getClassLoader(), properties); runner.run(dataSource); } return dataSource;