From 7069d3f6001f496cc64ca36c68000c338d55fcdb Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Sat, 13 Feb 2021 12:31:00 +1300 Subject: [PATCH] Update tests to use fetchQuery and fetchLazy rather than FetchConfig --- .../core/DefaultServer_createOrmQueryRequestTest.java | 8 ++++---- .../server/loadcontext/DLoadContextTest.java | 4 ++-- .../test/java/org/tests/batchload/TestBasicLazy.java | 2 +- .../org/tests/batchload/TestBatchLazyWithDeleted.java | 2 +- .../test/java/org/tests/batchload/TestLazyJoin2.java | 8 ++++---- .../tests/batchload/TestLazyLoadEmptyCollection.java | 4 ++-- .../org/tests/batchload/TestQueryJoinToAssocOne.java | 6 +++--- .../org/tests/batchload/TestSecondQueryNoRows.java | 2 +- .../java/org/tests/batchload/TestSecondaryQueries.java | 4 ++-- .../org/tests/query/TestQueryFetchJoinWithOrder.java | 4 ++-- .../test/java/org/tests/query/TestQueryFilterMany.java | 2 +- .../tests/query/TestQueryFilterManyOnSecondary.java | 4 ++-- .../org/tests/query/TestQueryFilterManySimple.java | 2 +- .../test/java/org/tests/query/TestQueryFindEach.java | 4 ++-- .../java/org/tests/query/TestQueryFindEachWhile.java | 4 ++-- .../java/org/tests/query/TestQueryJoinBatchSize.java | 2 +- .../java/org/tests/query/TestThreeLevelQueryJoin.java | 10 +++++----- .../tests/query/joins/TestQueryJoinManyNonRoot.java | 2 +- .../tests/query/joins/TestQueryJoinQueryNonRoot.java | 2 +- .../test/java/org/tests/rawsql/TestRawSqlOrmQuery.java | 2 +- .../org/tests/rawsql/TestRawSqlOrmQueryDistinct.java | 2 +- .../java/org/tests/rawsql/TestRawSqlOrmWrapper2.java | 2 +- .../java/org/tests/rawsql/TestRawSqlOrmWrapper3.java | 4 ++-- .../java/org/tests/rawsql/TestRawSqlWithResultSet.java | 2 +- .../org/tests/rawsql/inherit/ParentRawSqlTest.java | 10 +++++----- 25 files changed, 49 insertions(+), 49 deletions(-) diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java index 662bdf311..12c731115 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java @@ -99,7 +99,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { DefaultOrmQuery query1 = (DefaultOrmQuery) Ebean.find(Order.class) .select("status, shipDate") - .fetch("details", "orderQty, unitPrice", new FetchConfig().query()) + .fetchQuery("details", "orderQty, unitPrice") .fetch("details.product", "sku, name"); @@ -145,7 +145,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { Query query = Ebean.find(Order.class) .select("status, orderDate") .fetch("customer", "name") - .fetch("details", new FetchConfig().query()); + .fetchQuery("details"); OrmQueryRequest queryRequest = queryRequest(query); OrmQueryDetail detail = queryRequest.getQuery().getDetail(); @@ -201,7 +201,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { Query query = Ebean.find(Order.class) .select("status, orderDate") .fetch("customer", "name") - .fetch("details", new FetchConfig().lazy()) + .fetchLazy("details") .fetch("details.product"); OrmQueryRequest queryRequest = queryRequest(query); @@ -230,7 +230,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { Query query = Ebean.find(Order.class) .select("status, orderDate") - .fetch("details", new FetchConfig().query()) + .fetchQuery("details") .fetch("details.product") .fetch("customer", "name"); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java index 45962f7cd..4bffce7d8 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java @@ -76,14 +76,14 @@ public class DLoadContextTest extends BaseTestCase { @Test public void construct_when_fetchQueryFirst20Lazy5_expect_20_5_batchSize() { - OrmQueryRequest queryRequest = queryRequest(query().fetch("customer", new FetchConfig().queryFirst(20).lazy(5))); + OrmQueryRequest queryRequest = queryRequest(query().fetchQuery("customer")); queryRequest.initTransIfRequired(); queryRequest.endTransIfRequired(); DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext(); DLoadBeanContext customer = graphContext.getBeanContext("customer"); - assertThat(customer.batchSize).isEqualTo(5); + assertThat(customer.batchSize).isEqualTo(100); } @Test diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java b/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java index 7a146ed80..9656832a1 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java @@ -177,7 +177,7 @@ public class TestBasicLazy extends BaseTestCase { new FetchThread(tg, 2).start(); new FetchThread(tg, 3).start(); - orders = Ebean.find(Order.class).fetch("customer", new FetchConfig().lazy(100)).findList(); + orders = Ebean.find(Order.class).fetchLazy("customer").findList(); Assert.assertTrue(orders.size() >= 4); try { diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java index 1becb29bc..a91cbbd76 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java @@ -44,7 +44,7 @@ public class TestBatchLazyWithDeleted extends BaseTestCase { Ebean.save(twoC); List list = Ebean.find(UUTwo.class) - .fetch("master", new FetchConfig().lazy(5)) + .fetchLazy("master") .where().startsWith("name", "two-bld-") .order("name") .findList(); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java index 31d6027a7..b44e173dc 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java @@ -23,10 +23,10 @@ public class TestLazyJoin2 extends BaseTestCase { // This will use 3 SQL queries to build this object graph List l0 = Ebean.find(Order.class).select("status, shipDate") - .fetch("details", "orderQty, unitPrice", new FetchConfig().query()) + .fetchQuery("details", "orderQty, unitPrice") .fetch("details.product", "sku, name") - .fetch("customer", "name", new FetchConfig().query(10)) + .fetchQuery("customer", "name") .fetch("customer.contacts", "firstName, lastName, mobile") .fetch("customer.shippingAddress", "line1, city").order().asc("id").findList(); @@ -43,7 +43,7 @@ public class TestLazyJoin2 extends BaseTestCase { List orders = Ebean.find(Order.class) // .select("status") - .fetch("customer", new FetchConfig().query(3).lazy(10)).order().asc("id").findList(); + .fetchQuery("customer").order().asc("id").findList(); // .join("customer.contacts"); // List list = query.findList(); @@ -59,7 +59,7 @@ public class TestLazyJoin2 extends BaseTestCase { Assert.assertNotNull(billingAddress); - List list = Ebean.find(Order.class).fetch("customer", "name", new FetchConfig().lazy(5)) + List list = Ebean.find(Order.class).fetchLazy("customer", "name") .fetch("customer.contacts", "contactName, phone, email").fetch("customer.shippingAddress") .where().eq("status", Order.Status.NEW).order().asc("id").findList(); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java index f58b99fb2..8f8c770aa 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java @@ -24,8 +24,8 @@ public class TestLazyLoadEmptyCollection extends TransactionalTestCase { Ebean.save(c); List list = Ebean.find(Customer.class) - .fetch("contacts", new FetchConfig().query()) - .fetch("contacts.notes", new FetchConfig().query(100)) + .fetchQuery("contacts") + .fetchQuery("contacts.notes") .findList(); for (Customer customer : list) { diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java index d1b697a70..04883177e 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java @@ -29,7 +29,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { // This will use 2 SQL queries to build this object graph List l0 = Ebean.find(Order.class) - .fetch("details", "orderQty, unitPrice", new FetchConfig().query()) + .fetchQuery("details", "orderQty, unitPrice") .fetch("details.product", "sku, name") .findList(); @@ -56,7 +56,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { // This will use 2 SQL queries to build this object graph List l0 = Ebean.find(Order.class) .select("status, shipDate") - .fetch("details", "orderQty, unitPrice", new FetchConfig().query()) + .fetchQuery("details", "orderQty, unitPrice") .fetch("details.product", "sku, name") .findList(); @@ -83,7 +83,7 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { List l0 = Ebean.find(Order.class) .setDisableLazyLoading(true) .select("status, shipDate") - .fetch("details", "orderQty, unitPrice", new FetchConfig().query()) + .fetchQuery("details", "orderQty, unitPrice") .fetch("details.product", "sku, name") .order().asc("id") .findList(); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java b/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java index 3b4151589..e8a21786c 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java @@ -25,7 +25,7 @@ public class TestSecondQueryNoRows extends BaseTestCase { Customer c = Ebean.find(Customer.class) .setAutoTune(false) .setId(cnew.getId()) - .fetch("contacts", new FetchConfig().query()) + .fetchQuery("contacts") .findOne(); assertNotNull(c); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java index 4ae024159..b61b1fbac 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java @@ -129,9 +129,9 @@ public class TestSecondaryQueries extends TransactionalTestCase { Query query = Ebean.find(Order.class) .select("status") - .fetch("customer", "name, status", new FetchConfig().query()) + .fetchQuery("customer", "name, status") .fetch("customer.contacts") - .fetch("details", new FetchConfig().query()) + .fetchQuery("details") .where().eq("status", Order.Status.NEW) .query(); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java b/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java index 69be542f4..68a382e5c 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java @@ -19,14 +19,14 @@ public class TestQueryFetchJoinWithOrder extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Order.class) - .fetch("details", new FetchConfig().query()) + .fetchQuery("details") .order().asc("id") .order().desc("details.id").findList(); Assert.assertNotNull(list); List list2 = Ebean.find(Order.class) - .fetch("customer", new FetchConfig().query(5)) + .fetchQuery("customer") .fetch("customer.contacts") .order().asc("id") .order().asc("customer.contacts.lastName") diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java index 2e031fbf2..976dac580 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java @@ -29,7 +29,7 @@ public class TestQueryFilterMany extends BaseTestCase { LoggedSqlCollector.start(); Customer customer = Ebean.find(Customer.class) - .fetch("orders", new FetchConfig().lazy()) + .fetchLazy("orders") .filterMany("orders").eq("status", Order.Status.NEW) .where().ieq("name", "Rob") .order().asc("id").setMaxRows(1) diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java index 94353484a..f87c4c9c9 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java @@ -22,7 +22,7 @@ public class TestQueryFilterManyOnSecondary extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Customer.class) - .fetch("orders", new FetchConfig().query()) + .fetchQuery("orders") .where().ilike("name", "Rob%").gt("id", 0) .filterMany("orders").eq("status", Order.Status.NEW) .query(); @@ -44,7 +44,7 @@ public class TestQueryFilterManyOnSecondary extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Order.class) - .fetch("details", new FetchConfig().query()) + .fetchQuery("details") .fetch("details.product", "name") .filterMany("details").ilike("product.name", "c%") .query(); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java index 5feaefeb2..7dae5d580 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java @@ -25,7 +25,7 @@ public class TestQueryFilterManySimple extends BaseTestCase { .find(Customer.class) // .join("orders", new JoinConfig().lazy()) // .join("orders", new JoinConfig().query()) - .fetch("orders").fetch("contacts", new FetchConfig().query()).where().ilike("name", "rob%") + .fetch("orders").fetchQuery("contacts").where().ilike("name", "rob%") .filterMany("orders").eq("status", Order.Status.NEW).gt("orderDate", lastWeek) .filterMany("contacts").isNotNull("firstName").findList(); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java index 29a824f96..f0f959428 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java @@ -35,7 +35,7 @@ public class TestQueryFindEach extends BaseTestCase { ResetBasicData.reset(); Query query = DB.find(Customer.class) - .fetch("contacts", new FetchConfig().query(2)) + .fetchQuery("contacts") .where().gt("id", 0).order("id") .setMaxRows(2).query(); @@ -86,7 +86,7 @@ public class TestQueryFindEach extends BaseTestCase { ResetBasicData.reset(); Query query = DB.find(Customer.class) - .fetch("contacts", new FetchConfig().query(2)) + .fetchQuery("contacts") .where().gt("id", 0).order("id") .setMaxRows(2).query(); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java index 82e79d096..2588edf56 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java @@ -24,7 +24,7 @@ public class TestQueryFindEachWhile extends BaseTestCase { Query query = DB.find(Customer.class) .setAutoTune(false) - .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).order("id") + .fetchQuery("contacts").where().gt("id", 0).order("id") .setMaxRows(2).query(); final AtomicInteger counter = new AtomicInteger(0); @@ -47,7 +47,7 @@ public class TestQueryFindEachWhile extends BaseTestCase { ResetBasicData.reset(); Query query = DB.find(Customer.class).setAutoTune(false) - .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).order("id") + .fetchQuery("contacts").where().gt("id", 0).order("id") .setMaxRows(2).query(); final AtomicInteger counter = new AtomicInteger(0); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java b/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java index 77dd68977..721939ef9 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java @@ -18,7 +18,7 @@ public class TestQueryJoinBatchSize extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Order.class) - .fetch("customer", new FetchConfig().queryFirst(3).lazy(2)) + .fetch("customer") //.fetch("orders.details", new FetchConfig().query()) //.fetch("orders.shipments", new FetchConfig().query()) .findList(); diff --git a/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java b/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java index ae461101c..315a4263a 100644 --- a/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java +++ b/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java @@ -14,11 +14,11 @@ public class TestThreeLevelQueryJoin extends BaseTestCase { ResetBasicData.reset(); - Ebean.find(Customer.class).fetch("orders", new FetchConfig().query()) - .fetch("orders.details", new FetchConfig().query()) - .fetch("orders.shipments", new FetchConfig().query()) - .fetch("shippingAddress", new FetchConfig().query()) - .fetch("billingAddress", new FetchConfig().query()).findList(); + Ebean.find(Customer.class).fetchQuery("orders") + .fetchQuery("orders.details") + .fetchQuery("orders.shipments") + .fetchQuery("shippingAddress") + .fetchQuery("billingAddress").findList(); } diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java index 82eb65935..20812d6d2 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java @@ -96,7 +96,7 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { Query q = Ebean.find(Order.class) .fetch("customer") .fetch("customer.contacts") - .fetch("details", new FetchConfig().query(10)) + .fetchQuery("details") .fetch("details.product") .where().gt("id", 0).query(); diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java index fcbe77f6e..b24c07472 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java @@ -29,7 +29,7 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase { List list = Ebean.find(Order.class) .fetch("customer") - .fetch("customer.contacts", "firstName", new FetchConfig().query().lazy(10)) + .fetchQuery("customer.contacts", "firstName") .fetch("customer.contacts.group") .where().lt("id", 3).findList(); diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java index 947785bab..bece172f6 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java @@ -37,7 +37,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase { query.setRawSql(rawSql); query.where().ilike("name", "r%"); - query.fetch("contacts", new FetchConfig().query()); + query.fetchQuery("contacts"); query.filterMany("contacts").gt("lastName", "b"); List list = query.findList(); diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java index 8a150a944..19c53d44d 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java @@ -34,7 +34,7 @@ public class TestRawSqlOrmQueryDistinct extends BaseTestCase { query.setRawSql(rawSql); query.where().ilike("name", "r%"); - query.fetch("contacts", new FetchConfig().query()); + query.fetchQuery("contacts"); query.filterMany("contacts").gt("lastName", "b"); List list = query.findList(); diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java index 00f41f683..94df85a74 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java @@ -31,7 +31,7 @@ public class TestRawSqlOrmWrapper2 extends BaseTestCase { .create(); Query query = Ebean.find(OrderAggregate.class); - query.setRawSql(rawSql).fetch("order", "status,orderDate", new FetchConfig().query()) + query.setRawSql(rawSql).fetchQuery("order", "status,orderDate") .fetch("order.customer", "name").where().gt("order.id", 0).having().gt("totalAmount", 20) .order().desc("totalAmount").setMaxRows(10); diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java index 7a73fbabe..3e3bc2e20 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java @@ -33,8 +33,8 @@ public class TestRawSqlOrmWrapper3 extends BaseTestCase { .create(); List list2 = Ebean.find(OrderAggregate.class).setRawSql(rawSql) - .fetch("order", new FetchConfig().query()) - .fetch("order.details", new FetchConfig().query()) + .fetchQuery("order") + .fetchQuery("order.details") .where().gt("order.id", 2) .having().gt("totalAmount", 10) .filterMany("order.details").gt("unitPrice", 2d) diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java index 5c80f071d..300ecd524 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java @@ -39,7 +39,7 @@ public class TestRawSqlWithResultSet extends BaseTestCase { List list = Ebean.find(Customer.class) .setRawSql(rawSql) // also test a secondary query join - .fetch("billingAddress", new FetchConfig().query()) + .fetchQuery("billingAddress") .findList(); for (Customer customer : list) { diff --git a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java b/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java index 9ee61c693..e410bb9af 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java +++ b/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java @@ -131,7 +131,7 @@ public class ParentRawSqlTest extends BaseTestCase { .create(); List uncles = Ebean.find(EUncle.class).setRawSql(rawSql) - .fetch("parent", new FetchConfig().query()) + .fetchQuery("parent") .findList(); assertNotNull(uncles.get(0)); @@ -150,7 +150,7 @@ public class ParentRawSqlTest extends BaseTestCase { .create(); List uncles = Ebean.find(EUncle.class).setRawSql(rawSql) - .fetch("parent", new FetchConfig().query()) + .fetchQuery("parent") .findList(); assertNotNull(uncles.get(0)); @@ -185,7 +185,7 @@ public class ParentRawSqlTest extends BaseTestCase { .create(); List aggregates = Ebean.find(ParentAggregate.class).setRawSql(rawSql) - .fetch("parent", new FetchConfig().query()) + .fetchQuery("parent") .findList(); List partial = new ArrayList<>(); @@ -209,7 +209,7 @@ public class ParentRawSqlTest extends BaseTestCase { .create(); List aggregates = Ebean.find(ParentAggregate.class).setRawSql(rawSql) - .fetch("parent", new FetchConfig().query()) + .fetchQuery("parent") .findList(); List partial = new ArrayList<>(); @@ -235,7 +235,7 @@ public class ParentRawSqlTest extends BaseTestCase { .create(); List aggregates = Ebean.find(ParentAggregate.class).setRawSql(rawSql) - .fetch("parent", new FetchConfig().query()) + .fetchQuery("parent") .findList(); List partial = new ArrayList<>();