github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1892 - Refactor change internal use of Ebean to DB

Browse Source
This commit is contained in:
rob bygrave
2019-12-13 14:17:05 +13:00
parent 502b20be67
commit 5cd74bc468
14 changed files with 65 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+5 -4
View File
@@ -1,6 +1,7 @@
package io.ebeaninternal.dbmigration;
import io.ebean.Ebean;
import io.ebean.DB;
import io.ebean.Database;
import io.ebean.EbeanServer;
import io.ebean.annotation.Platform;
import io.ebean.config.DbConstraintNaming;
@@ -142,8 +143,8 @@ public class DefaultDbMigration implements DbMigration {
* Typically this is not called explicitly.
*/
@Override
public void setServer(EbeanServer ebeanServer) {
this.server = (SpiEbeanServer) ebeanServer;
public void setServer(Database database) {
this.server = (SpiEbeanServer) database;
setServerConfig(server.getServerConfig());
}
@@ -671,7 +672,7 @@ public class DefaultDbMigration implements DbMigration {
*/
private void setDefaults() {
if (server == null) {
setServer(Ebean.getDefaultServer());
setServer(DB.getDefault());
}
if (vanillaPlatform || databasePlatform == null) {
// not explicitly set so use the platform of the server