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

Fix/select distinct cascaded fetch (#1015)

Browse Source 
Fix/select distinct cascaded fetch with findSingleAttributeList() on associated property path
This commit is contained in:
Roland Praml
2017-04-30 23:07:35 +12:00
committed by Rob Bygrave
parent e51f7f11f1
commit f9c70d2a2b
4 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java
+4 -4
View File
@@ -175,7 +175,7 @@ public class OrmQueryDetailTest extends BaseTestCase {
OrmQueryDetail detail = new OrmQueryDetail();
detail.fetch("details", null, null);
detail.markQueryJoins(orderDesc(), null, true);
detail.markQueryJoins(orderDesc(), null, true, true);
assertThat(detail.getChunk("details", false).isQueryFetch()).isFalse();
}
@@ -186,7 +186,7 @@ public class OrmQueryDetailTest extends BaseTestCase {
OrmQueryDetail detail = new OrmQueryDetail();
detail.fetch("details", null, null);
detail.markQueryJoins(orderDesc(), null, false);
detail.markQueryJoins(orderDesc(), null, false, true);
assertThat(detail.getChunk("details", false).isQueryFetch()).isTrue();
}
@@ -198,7 +198,7 @@ public class OrmQueryDetailTest extends BaseTestCase {
detail.fetch("details", null, null);
detail.fetch("customer.contacts", null, null);
detail.markQueryJoins(orderDesc(), null, true);
detail.markQueryJoins(orderDesc(), null, true, true);
assertThat(detail.getChunk("details", false).isQueryFetch()).isFalse();
assertThat(detail.getChunk("customer.contacts", false).isQueryFetch()).isTrue();
@@ -211,7 +211,7 @@ public class OrmQueryDetailTest extends BaseTestCase {
detail.fetch("details", null, null);
detail.fetch("customer.contacts", null, null);
detail.markQueryJoins(orderDesc(), null, false);
detail.markQueryJoins(orderDesc(), null, false, true);
assertThat(detail.getChunk("details", false).isQueryFetch()).isTrue();
assertThat(detail.getChunk("customer.contacts", false).isQueryFetch()).isTrue();
src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
+16
View File
@@ -3,6 +3,8 @@ package org.tests.query.other;
import io.ebean.BaseTestCase;
import io.ebean.Ebean;
import io.ebean.Query;
import org.tests.model.basic.Contact;
import org.tests.model.basic.Customer;
import org.tests.model.basic.ResetBasicData;
import org.avaje.test.model.rawsql.inherit.ChildA;
@@ -162,6 +164,20 @@ public class TestQuerySingleAttribute extends BaseTestCase {
assertThat(cities).contains("Auckland").containsNull();
}
@Test
public void distinctWithCascadedFetch() {
ResetBasicData.reset();
Query<Contact> query = Ebean.find(Contact.class)
.setDistinct(true)
.fetch("customer.billingAddress","city");
List<String> cities = query.findSingleAttributeList();
assertThat(sqlOf(query)).contains("select distinct t2.city from contact t0 join o_customer t1 on t1.id = t0.customer_id left join o_address t2 on t2.id = t1.billing_address_id");
assertThat(cities).contains("Auckland").containsNull();
}
@Test
public void distinctSelectOnInheritedBean() {