#2085 - Refactor promote getDataSource() and getReadOnlyDataSource() to Database from plugin.SpiServer interface

This commit is contained in:
rob bygrave committed 2020-10-20 12:08:21 +13:00
1 parent 4a594b32ef
commit 0abcc9e06e
11 files changed
+30 -18

No files matched your search

@@ -27,7 +27,7 @@ public class SqlServerStepSequenceTest extends BaseTestCase {
server().sqlUpdate("create sequence sqls_testseq_9876 start with 1 increment by 50").execute();
BackgroundExecutor be = server().getBackgroundExecutor();
DataSource ds = server().getPluginApi().getDataSource();
DataSource ds = server().getDataSource();
SqlServerStepSequence s = new SqlServerStepSequence(be, ds, "sqls_testseq_9876", 50);
@@ -53,6 +53,7 @@ import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
import javax.persistence.OptimisticLockException;
import javax.persistence.PersistenceException;
import javax.sql.DataSource;
import java.lang.reflect.Type;
import java.time.Clock;
import java.util.Collection;
@@ -336,6 +337,16 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
return null;
}
@Override
public DataSource getDataSource() {
return null;
}
@Override
public DataSource getReadOnlyDataSource() {
return null;
}
@Override
public String getName() {
return name;
@@ -258,7 +258,7 @@ public class TestRawSqlBuilder extends BaseTestCase {
"join o_customer c on o.kcustomer_id = c.id " +
"where c.id = ? and o.id > ?";
final DataSource dataSource = DB.getDefault().getPluginApi().getDataSource();
final DataSource dataSource = DB.getDefault().getDataSource();
try (Connection connection = dataSource.getConnection()) {
try (PreparedStatement stmt = connection.prepareStatement(sql)) {