mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-19 23:02:24 +00:00
Merge remote-tracking branch 'upstream/master'
# Conflicts: # ebean-test/src/test/java/io/ebean/xtest/base/PropertyTest.java # ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationGenerateTest.java
This commit is contained in:
commit
06cbb21a8a
29 files changed
+1525
-102
No files matched your search
@@ -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<String> getPendingDrops();
|
||||
|
||||
/**
|
||||
* Return the main migration directory.
|
||||
*/
|
||||
File migrationDirectory();
|
||||
|
||||
/**
|
||||
* Generate the next migration sql script and associated model xml.
|
||||
* <p>
|
||||
|
||||
+2
-4
@@ -837,10 +837,8 @@ public class DefaultDbMigration implements DbMigration {
|
||||
return val;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the main migration directory.
|
||||
*/
|
||||
File migrationDirectory() {
|
||||
@Override
|
||||
public File migrationDirectory() {
|
||||
return migrationDirectory(false);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user