diff --git a/ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java b/ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java index ec6db4597..2a1005fe3 100644 --- a/ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java +++ b/ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java @@ -5,6 +5,7 @@ import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.DatabasePlatform; +import java.io.File; import java.io.IOException; import java.util.Iterator; import java.util.List; @@ -218,6 +219,11 @@ public interface DbMigration { */ List getPendingDrops(); + /** + * Return the main migration directory. + */ + File migrationDirectory(); + /** * Generate the next migration sql script and associated model xml. *

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 c48266dcb..4ef6ef72f 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 @@ -756,10 +756,8 @@ public class DefaultDbMigration implements DbMigration { return val; } - /** - * Return the main migration directory. - */ - File migrationDirectory() { + @Override + public File migrationDirectory() { return migrationDirectory(false); } diff --git a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationDropHistoryTest.java similarity index 87% rename from ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java rename to ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationDropHistoryTest.java index 4fa963827..4f5471c62 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationDropHistoryTest.java @@ -1,9 +1,9 @@ -package io.ebeaninternal.dbmigration; +package io.ebean.xtest.dbmigration; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.config.DatabaseConfig; -import org.assertj.core.api.Assertions; +import io.ebean.dbmigration.DbMigration; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,28 +25,22 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; * @author Roland Praml, FOCONIS AG * */ -public class DbMigrationDropHistoryTest { +class DbMigrationDropHistoryTest { private static final Logger logger = LoggerFactory.getLogger(DbMigrationDropHistoryTest.class); @Test - public void invokeTest() throws IOException { + void invokeTest() throws IOException { main(null); } - @Test - public void lastVersion_no_v_Prefix() { - File d = new File("src/test/resources/migrationtest-history/dbmigration"); - Assertions.assertThat(LastMigration.lastVersion(d, null)).isEqualTo("1.2"); - } - public static void main(String[] args) throws IOException { logger.info("start"); // First, we clean up the output-directory Files.walk(Paths.get("src/test/resources/migrationtest-history")) .filter(Files::isRegularFile).map(Path::toFile).forEach(File::delete); - DefaultDbMigration migration = new DefaultDbMigration(); + DbMigration migration = DbMigration.create(); // We use src/test/resources as output directory (so we see in GIT if files will change) diff --git a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationGenerateTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java rename to ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationGenerateTest.java index 82b74862d..df7074216 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationGenerateTest.java @@ -1,9 +1,10 @@ -package io.ebeaninternal.dbmigration; +package io.ebean.xtest.dbmigration; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; +import io.ebean.dbmigration.DbMigration; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,7 +55,7 @@ public class DbMigrationGenerateTest { Files.walk(Paths.get(pathToResources, "migrationtest")) .filter(Files::isRegularFile).map(Path::toFile).forEach(File::delete); - DefaultDbMigration migration = new DefaultDbMigration(); + DbMigration migration = DbMigration.create(); migration.setIncludeIndex(true); // We use src/test/resources as output directory (so we see in GIT if files will change) migration.setPathToResources(pathToResources); diff --git a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java rename to ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationTest.java index e2412d08b..3c856b13e 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationTest.java @@ -1,19 +1,17 @@ -package io.ebeaninternal.dbmigration; +package io.ebean.xtest.dbmigration; import io.ebean.*; -import io.ebean.xtest.BaseTestCase; -import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.DbHistorySupport; import io.ebean.datasource.pool.ConnectionPool; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.IgnorePlatform; import misc.migration.v1_0.ETable; import misc.migration.v1_1.EHistory; import misc.migration.v1_1.EHistory2; -import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import java.io.File; import java.io.IOException; import java.net.URL; import java.sql.ResultSet; @@ -44,14 +42,6 @@ public class DbMigrationTest extends BaseTestCase { server().script().run(url); } - @Test - public void lastVersion() { - File d = new File("src/test/resources/migrationtest/dbmigration/h2"); - Assertions.assertThat(LastMigration.lastVersion(d, null)).isEqualTo("1.4"); - assertThat(LastMigration.nextVersion(d, null, false)).isEqualTo("1.5"); - assertThat(LastMigration.nextVersion(d, null, true)).isEqualTo("1.4"); - } - @IgnorePlatform({ // Yugabyte does not see column updates on table alters: // update table T set C = 'value'; alter table T alter column C set not null -> error column C has null values