Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/main/java/io/ebean/test/containers/EbeanAdapter.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ public io.ebean.DatabaseBuilder builder() {
return io.ebean.Database.builder()
.dataSourceBuilder(dataSourceBuilder())
.name(dbConfig.getDbName())
.register(false)
.ddlGenerate(true)
.ddlRun(true);
}
Expand Down
22 changes: 14 additions & 8 deletions src/main/java/io/ebean/test/containers/EbeanSDK.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public interface EbeanSDK {
/**
* Return an ebean Database builder for the underlying database (url, username, password).
* <p>
* This defaults to register with Ebean's io.ebean.DB as the default database.
* The name of the ebean database will be dbName set for the container.
* <p>
* This builder will have ddlGenerate set to true and ddlRun set to true. Alternatively,
Expand All @@ -32,22 +33,27 @@ public interface EbeanSDK {
io.ebean.datasource.DataSourceBuilder dataSourceBuilder();

/**
* Return a DataSource builder for the extra database (url, username, password).
* Return an ebean Database builder for the EXTRA database.
* <p>
* This is set to not register with Ebean's io.ebean.DB.
*/
io.ebean.datasource.DataSourceBuilder extraDataSourceBuilder();
io.ebean.DatabaseBuilder extraDatabaseBuilder();

/**
* Return a DataSource builder for the second extra database (url, username, password).
* Return a DataSource builder for the extra database (url, username, password).
*/
io.ebean.datasource.DataSourceBuilder extra2DataSourceBuilder();
io.ebean.datasource.DataSourceBuilder extraDataSourceBuilder();

/**
* Return an ebean Database builder for the EXTRA database.
* Return an ebean Database builder for the second EXTRA2 database.
* <p>
* This is set to not register with Ebean's io.ebean.DB.
*/
io.ebean.DatabaseBuilder extraDatabaseBuilder();
io.ebean.DatabaseBuilder extra2DatabaseBuilder();

/**
* Return an ebean Database builder for the second EXTRA2 database.
* Return a DataSource builder for the second extra database (url, username, password).
*/
io.ebean.DatabaseBuilder extra2DatabaseBuilder();
io.ebean.datasource.DataSourceBuilder extra2DataSourceBuilder();

}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ void extraDb() throws java.sql.SQLException {
}
dataSource.shutdown();

Database ebean = container.ebean().builder().build();
Database ebean = container.ebean().builder()
.register(false)
.defaultDatabase(false)
.build();
ebean.sqlUpdate("insert into test_junk2 (acol) values (?)")
.setParameter(45)
.execute();
Expand Down