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

#704 - Internal refactor to use excludeBeanCache in DefaultOrmQuery

Browse Source
This commit is contained in:
Robin Bygrave
2016-05-13 15:56:45 +12:00
parent 8c6653605d
commit d1d4bf1da8
13 changed files with 182 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/avaje/tests/basic/TestQueryWithCache.java
+16
View File
@@ -2,6 +2,7 @@ package com.avaje.tests.basic;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.Ebean;
import com.avaje.ebean.Query;
import com.avaje.ebean.cache.ServerCache;
import com.avaje.ebean.cache.ServerCacheManager;
import com.avaje.ebeaninternal.api.SpiEbeanServer;
@@ -11,6 +12,7 @@ import com.avaje.tests.model.basic.Country;
import com.avaje.tests.model.basic.ResetBasicData;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -56,4 +58,18 @@ public class TestQueryWithCache extends BaseTestCase {
assertTrue(nz3 != nz4);
}
@Test
public void testSkipCache() {
ResetBasicData.reset();
Ebean.find(Country.class, "NZ");
Query<Country> query = Ebean.find(Country.class).setId("NZ").setUseCache(false);
query.findUnique();
assertThat(query.getGeneratedSql()).isNotNull();
}
}
src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java
-2
View File
@@ -50,7 +50,6 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
// This will use 2 SQL queries to build this object graph
List<Order> l0 = Ebean.find(Order.class)
.setUseCache(false)
.select("status, shipDate")
.fetch("details", "orderQty, unitPrice", new FetchConfig().query())
.fetch("details.product", "sku, name")
@@ -77,7 +76,6 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
// This will use 2 SQL queries to build this object graph
List<Order> l0 = Ebean.find(Order.class)
.setUseCache(false)
.setDisableLazyLoading(true)
.select("status, shipDate")
.fetch("details", "orderQty, unitPrice", new FetchConfig().query())
src/test/java/com/avaje/tests/query/other/TestQueryDistinct.java
-3
View File
@@ -21,7 +21,6 @@ public class TestQueryDistinct extends BaseTestCase {
ResetBasicData.reset();
Query<Customer> query = Ebean.find(Customer.class)
.setUseCache(false)
.setDistinct(true)
.select("name");
@@ -48,7 +47,6 @@ public class TestQueryDistinct extends BaseTestCase {
ResetBasicData.reset();
Query<Customer> query = Ebean.find(Customer.class)
.setUseCache(false)
.where().setDistinct(true)
.select("name");
@@ -64,7 +62,6 @@ public class TestQueryDistinct extends BaseTestCase {
ResetBasicData.reset();
Query<Customer> query = Ebean.find(Customer.class)
.setUseCache(false)
.setDistinct(true)
.select("status")
.where().isNotNull("status").query();
src/test/java/com/avaje/tests/query/other/TestWhereAnnotation.java
+1 -3
View File
@@ -40,9 +40,7 @@ public class TestWhereAnnotation extends BaseTestCase {
LoggedSqlCollector.start();
List<Customer> customers = Ebean.find(Customer.class)
.setUseCache(false)
.findList();
List<Customer> customers = Ebean.find(Customer.class).findList();
List<Order> orders = customers.get(0).getOrders();
orders.size();
src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQuery.java
-6
View File
@@ -32,7 +32,6 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
.columnMapping("r.name", "name").create();
Query<Customer> query = Ebean.find(Customer.class);
query.setUseCache(false).setUseQueryCache(false);
query.setRawSql(rawSql);
query.where().ilike("name", "r%");
@@ -58,7 +57,6 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
.create();
Query<Customer> query = Ebean.find(Customer.class);
query.setUseCache(false).setUseQueryCache(false);
query.setRawSql(rawSql);
int initialRowCount = query.findRowCount();
@@ -91,7 +89,6 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
.create();
Query<Customer> query = Ebean.find(Customer.class);
query.setUseCache(false).setUseQueryCache(false);
query.setRawSql(rawSql);
int initialRowCount = query.findRowCount();
@@ -123,7 +120,6 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
.create();
Query<Order> query = Ebean.find(Order.class);
query.setUseCache(false).setUseQueryCache(false);
query.setRawSql(rawSql);
query.setMaxRows(100);
@@ -144,7 +140,6 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
.create();
Query<Order> query = Ebean.find(Order.class);
query.setUseCache(false).setUseQueryCache(false);
query.setRawSql(rawSql);
query.setMaxRows(100);
@@ -166,7 +161,6 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
.create();
Query<Order> query = Ebean.find(Order.class);
query.setUseCache(false).setUseQueryCache(false);
query.setRawSql(rawSql);
query.setMaxRows(100);