Merge branch 'api-to-run-ddl-manually' into ebean-new

# Conflicts:
#	ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
This commit is contained in:
Roland Praml committed 2022-01-03 16:05:17 +01:00
commit 301d8b6f1f
7 files changed
+55 -84

No files matched your search

@@ -55,8 +55,7 @@ public class TestServerOffline {
public synchronized void initDatabase() {
if (!initialized) {
server.runDdl();
server.runMigration();
server.start();
initialized = true;
}
}
@@ -78,11 +77,11 @@ public class TestServerOffline {
Properties props = props(url);
// to bring up ebean without a database, we must disable varous things
// to bring up ebean without a database, we must disable various things
// that happen on startup
props.setProperty("datasource.h2_offline.failOnStart", "false");
props.setProperty("ebean.h2_offline.skipDataSourceCheck", "true");
props.setProperty("ebean.h2_offline.ddl.run", "false");
props.setProperty("ebean.h2_offline.skipStart", "true");
DatabaseConfig config = config(props);
LazyDatasourceInitializer alert = new LazyDatasourceInitializer() ;
@@ -644,12 +644,7 @@ public class TDSpiServer implements SpiServer {
}
@Override
public void runDdl() {
}
@Override
public void runMigration() {
public void start() {
}
}