diff --git a/ebean-dbmigration-runner/src/main/java/io/ebeaninternal/dbmigration/run/DbRunMigrationPlugin.java b/ebean-dbmigration-runner/src/main/java/io/ebeaninternal/dbmigration/run/DbRunMigrationPlugin.java index 6c4066f3c..a2a63f78a 100644 --- a/ebean-dbmigration-runner/src/main/java/io/ebeaninternal/dbmigration/run/DbRunMigrationPlugin.java +++ b/ebean-dbmigration-runner/src/main/java/io/ebeaninternal/dbmigration/run/DbRunMigrationPlugin.java @@ -26,7 +26,7 @@ public class DbRunMigrationPlugin implements Plugin { migrationRunner.setDefaultDbSchema(dbSchema); } migrationRunner.setName(config.getName()); - migrationRunner.setPlatform(config.getDatabasePlatform().getPlatform().base().name().toLowerCase()); + migrationRunner.setPlatform(config.getDatabasePlatform().getPlatform().name().toLowerCase()); migrationRunner.loadProperties(config.getProperties()); } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DbMigrationPlugin.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DbMigrationPlugin.java index 6d27d530a..1839cf491 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DbMigrationPlugin.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DbMigrationPlugin.java @@ -37,7 +37,7 @@ public class DbMigrationPlugin implements Plugin { lastInit = dbMigration.generateInitMigration(); } } catch (IOException e) { - throw new RuntimeException("Error while generating migration"); + throw new RuntimeException("Error while generating migration", e); } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java index dc0d50dc9..20a1fb520 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java @@ -13,6 +13,7 @@ import java.util.StringJoiner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import io.avaje.classpath.scanner.core.Location; import io.ebean.DB; import io.ebean.Database; import io.ebean.annotation.Platform; @@ -863,7 +864,8 @@ public class DefaultDbMigration implements DbMigration { } private String migrationPath(boolean initMigration) { - return initMigration ? migrationInitPath : migrationPath; + // remove classpath: or filesystem: prefix + return new Location(initMigration ? migrationInitPath : migrationPath).path(); } /**