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

#1417 - Breaking API - Remove PersistBatch.INSERT ... migrate to PersistBatch.ALL

Browse Source
This commit is contained in:
rob bygrave
2018-06-18 21:15:10 +12:00
parent 117737c790
commit 8d976f83a9
14 changed files with 140 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/io/ebean/TxScopeTest.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class TxScopeTest {
TxScope scope = new TxScope();
scope.setBatchSize(100);
scope.setBatchOnCascade(PersistBatch.INSERT);
scope.setBatchOnCascade(PersistBatch.ALL);
scope.checkBatchMode();
assertNull(scope.getBatch());
src/test/java/io/ebean/config/ServerConfigTest.java
+4 -4
View File
@@ -51,8 +51,8 @@ public class ServerConfigTest {
serverConfig.setReadOnlyDataSourceConfig(new DataSourceConfig());
Properties props = new Properties();
props.setProperty("persistBatch", "INSERT");
props.setProperty("persistBatchOnCascade", "INSERT");
props.setProperty("persistBatch", "ALL");
props.setProperty("persistBatchOnCascade", "ALL");
props.setProperty("dbuuid", "binary");
props.setProperty("jdbcFetchSizeFindEach", "42");
props.setProperty("jdbcFetchSizeFindList", "43");
@@ -80,8 +80,8 @@ public class ServerConfigTest {
assertThat(serverConfig.getNamingConvention()).isInstanceOf(MatchingNamingConvention.class);
assertEquals(IdType.SEQUENCE, serverConfig.getIdType());
assertEquals(PersistBatch.INSERT, serverConfig.getPersistBatch());
assertEquals(PersistBatch.INSERT, serverConfig.getPersistBatchOnCascade());
assertEquals(PersistBatch.ALL, serverConfig.getPersistBatch());
assertEquals(PersistBatch.ALL, serverConfig.getPersistBatchOnCascade());
assertEquals(PlatformConfig.DbUuid.BINARY, serverConfig.getPlatformConfig().getDbUuid());
assertEquals(JsonConfig.DateTime.ISO8601, serverConfig.getJsonDateTime());
src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
+2 -2
View File
@@ -28,7 +28,7 @@ public class TestBatchInsertSimple extends BaseTestCase {
Transaction transaction = Ebean.beginTransaction();
try {
transaction.setBatch(PersistBatch.NONE);
transaction.setBatchOnCascade(PersistBatch.INSERT);
transaction.setBatchOnCascade(PersistBatch.ALL);
transaction.setBatchSize(30);
// setBatchGetGeneratedKeys MUST be turned off for MS SQL Server because :(
transaction.setBatchGetGeneratedKeys(false);
@@ -101,7 +101,7 @@ public class TestBatchInsertSimple extends BaseTestCase {
Transaction transaction = Ebean.beginTransaction();
try {
transaction.setBatch(PersistBatch.NONE);
transaction.setBatchOnCascade(PersistBatch.INSERT);
transaction.setBatchOnCascade(PersistBatch.ALL);
transaction.setBatchSize(30);
// setBatchGetGeneratedKeys MUST be turned off for MS SQL Server because :(
transaction.setBatchGetGeneratedKeys(false);
src/test/java/org/tests/model/basic/xtra/DummyDao.java
+3 -3
View File
@@ -46,19 +46,19 @@ public class DummyDao {
}
@Transactional(batch = PersistBatch.INSERT, batchOnCascade = PersistBatch.NONE, batchSize = 77)
@Transactional(batch = PersistBatch.ALL, batchOnCascade = PersistBatch.NONE, batchSize = 77)
public void doOuterWithBatchOptionsSet() {
Transaction txn = Ebean.currentTransaction();
assertEquals(PersistBatch.INSERT, txn.getBatch());
assertEquals(PersistBatch.ALL, txn.getBatch());
assertEquals(PersistBatch.NONE, txn.getBatchOnCascade());
assertEquals(77, txn.getBatchSize());
doWithBatchOptionsSet();
// batch options set back
assertEquals(PersistBatch.INSERT, txn.getBatch());
assertEquals(PersistBatch.ALL, txn.getBatch());
assertEquals(PersistBatch.NONE, txn.getBatchOnCascade());
assertEquals(77, txn.getBatchSize());
src/test/java/org/tests/transaction/TestBatchPersistCascade.java
+2 -2
View File
@@ -29,7 +29,7 @@ public class TestBatchPersistCascade extends BaseTestCase {
Transaction txn = ebeanServer.beginTransaction();
try {
txn.setBatch(PersistBatch.INSERT);
txn.setBatch(PersistBatch.ALL);
logger.info("start ------------");
for (int i = 0; i < 3; i++) {
@@ -62,7 +62,7 @@ public class TestBatchPersistCascade extends BaseTestCase {
Transaction txn = server.beginTransaction();
try {
txn.setBatch(PersistBatch.INSERT);
txn.setBatch(PersistBatch.ALL);
txn.setBatchOnCascade(PersistBatch.ALL);
for (int i = 0; i < 3; i++) {