#1556 - Query.setDisableLazyLoading(true) not working on @OneToMany Set (but does on List)

src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java

@@ -3,12 +3,17 @@ package org.tests.batchload;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.FetchConfig;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.OrderDetail;
 import org.tests.model.basic.ResetBasicData;
-import org.ebeantest.LoggedSqlCollector;
-import org.junit.Test;
+import org.tests.model.m2m.Role;
+import org.tests.model.m2m.Tenant;
+import org.tests.model.map.MpRole;
+import org.tests.model.map.MpUser;
 
+import java.util.Arrays;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -107,6 +112,93 @@ public class TestQueryJoinToAssocOne extends BaseTestCase {
     assertThat(secondaryQuery).contains(" order by t0.order_id, t0.id");
   }
 
+  @Test
+  public void disableLazyLoading_when_oneToManyList() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    // This will use 2 SQL queries to build this object graph
+    List<Order> l0 = Ebean.find(Order.class)
+      .setDisableLazyLoading(true)
+      .select("status, shipDate")
+      .order().asc("id")
+      .findList();
+
+    assertThat(l0).isNotEmpty();
+
+    Order order = l0.get(0);
+    // try to invoke lazy loading on the bean
+    assertThat(order.getCustomer()).isNull();
+    assertThat(order.getCretime()).isNull();
+
+    // try to invoke lazy loading on the OneToMany ...
+    List<OrderDetail> details = order.getDetails();
+    assertThat(details).isEmpty();
+    assertThat(details.size()).isEqualTo(0);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+  }
+
+  @Test
+  public void disableLazyLoad_when_oneToManySet() {
+
+    Role role0 = new Role("r0");
+    Role role1 = new Role("r1");
+    Ebean.save(role0);
+    Ebean.save(role1);
+
+    Tenant tenant = new Tenant("t0");
+    tenant.getRoles().add(role0);
+    tenant.getRoles().add(role1);
+
+    Ebean.save(tenant);
+
+    LoggedSqlCollector.start();
+
+    Tenant found = Ebean.find(Tenant.class)
+      .setDisableLazyLoading(true)
+      .select("name")
+      .setId(tenant.getId())
+      .findOne();
+
+    assertThat(found.getRoles().size()).isEqualTo(0);
+
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+  }
+
+  @Test
+  public void disableLazyLoading_when_oneToManyMap() {
+
+    MpRole r0 = new MpRole();
+    r0.setCode("disableLazyLoading");
+
+    MpUser u = new MpUser();
+    u.setName("disableLazy");
+    u.getRoles().put("disableLazyLoading", r0);
+    Ebean.save(u);
+
+    LoggedSqlCollector.start();
+
+    MpUser found = Ebean.find(MpUser.class)
+      .setDisableLazyLoading(true)
+      .select("name")
+      .setId(u.getId())
+      .findOne();
+
+    // normally invokes lazy loading
+    assertThat(found.getRoles().size()).isEqualTo(0);
+
+    // only 1 query ... no lazy loading query
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+
+    Ebean.deleteAll(Arrays.asList(found, r0));
+  }
+
   @Test
   public void testJoinOnPartiallyPopulatedParent_withLazyLoadingDisabled() {
 

src/test/java/org/tests/query/other/TestOneToManyAsMap.java

@@ -2,11 +2,10 @@ package org.tests.query.other;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import io.ebean.EbeanServer;
-import org.tests.model.map.MpRole;
-import org.tests.model.map.MpUser;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.map.MpRole;
+import org.tests.model.map.MpUser;
 
 import java.util.Map;
 
@@ -15,21 +14,19 @@ public class TestOneToManyAsMap extends BaseTestCase {
   @Test
   public void test() {
 
-    EbeanServer eServer = Ebean.getServer(null);
-
     MpUser u = new MpUser();
-    eServer.save(u);
+    Ebean.save(u);
 
-    MpUser u2 = eServer.find(MpUser.class, u.getId());
+    MpUser u2 = Ebean.find(MpUser.class, u.getId());
     Assert.assertNotNull(u2);
 
     u2.setName("Charlie Brown");
     MpRole ourl = new MpRole();
     ourl.setOrganizationId(47L);
     u2.getRoles().put("one", ourl);
-    eServer.save(u2);
+    Ebean.save(u2);
 
-    MpUser u3 = eServer.find(MpUser.class, u.getId());
+    MpUser u3 = Ebean.find(MpUser.class, u.getId());
     Assert.assertEquals("Charlie Brown", u3.getName());
 
     Map<String, MpRole> listMap = u3.getRoles();