#768 - Query.setDisableLazyLoading(true) ... not disabling lazy loading on @ManyToOne reference bean

src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorTest.java

@@ -18,7 +18,7 @@ public class BeanDescriptorTest extends BaseTestCase {
   @Test
   public void createReference() {
 
-    Customer bean = customerDesc.createReference(null, 42, null);
+    Customer bean = customerDesc.createReference(null, false, 42, null);
     assertThat(bean.getId()).isEqualTo(42);
     assertThat(server().getBeanState(bean).isReadOnly()).isFalse();
   }
@@ -26,17 +26,24 @@ public class BeanDescriptorTest extends BaseTestCase {
   @Test
   public void createReference_whenReadOnly() {
 
-    Customer bean = customerDesc.createReference(Boolean.TRUE, 42, null);
+    Customer bean = customerDesc.createReference(Boolean.TRUE, false, 42, null);
     assertThat(server().getBeanState(bean).isReadOnly()).isTrue();
   }
 
   @Test
   public void createReference_whenNotReadOnly() {
 
-    Customer bean = customerDesc.createReference(Boolean.FALSE, 42, null);
+    Customer bean = customerDesc.createReference(Boolean.FALSE, false, 42, null);
     assertThat(server().getBeanState(bean).isReadOnly()).isFalse();
   }
 
+  @Test
+  public void createReference_when_disabledLazyLoad() {
+
+    Customer bean = customerDesc.createReference(Boolean.FALSE, true, 42, null);
+    assertThat(server().getBeanState(bean).isDisableLazyLoad()).isTrue();
+  }
+
   @Test
   public void allProperties() {
 

src/test/java/com/avaje/tests/batchload/TestQueryDisableLazyLoad.java

@@ -11,6 +11,7 @@ import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 public class TestQueryDisableLazyLoad {
 
@@ -39,4 +40,51 @@ public class TestQueryDisableLazyLoad {
     assertThat(loggedSql.get(0)).contains("select t0.id c0, t0.status c1, t0.order_date c2,");
     assertThat(loggedSql.get(0)).contains(" from o_order t0 ");
   }
+
+  @Test
+  public void onAssocOne() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    List<Order> l0 = Ebean.find(Order.class)
+        .setDisableLazyLoading(true)
+        .order().asc("id")
+        .findList();
+
+    assertThat(l0).isNotEmpty();
+
+    Order order = l0.get(0);
+
+    // normally invokes lazy loading
+    assertNull(order.getCustomer().getStatus());
+
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertThat(loggedSql).hasSize(1);
+  }
+
+  @Test
+  public void onAssocOne_when_partial() {
+
+    ResetBasicData.reset();
+
+    LoggedSqlCollector.start();
+
+    List<Order> l0 = Ebean.find(Order.class)
+        .setDisableLazyLoading(true)
+        .fetch("customer","smallnote")
+        .order().asc("id")
+        .findList();
+
+    assertThat(l0).isNotEmpty();
+
+    Order order = l0.get(0);
+
+    // normally invokes lazy loading
+    assertNull(order.getCustomer().getStatus());
+
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertThat(loggedSql).hasSize(1);
+  }
 }