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

#980 - fix several bugs in findSingleAttibute - Refactor moving logic into DefaultOrmQuery setDefaultSelectClause() from findSingleAttributeList() (to support alternate calling via EbeanServer)

Browse Source
This commit is contained in:
Rob Bygrave
2017-02-26 13:08:10 +13:00
parent a46e086dc4
commit 0e2900d796
4 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+6 -5
View File
@@ -513,7 +513,12 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
@Override
public void setDefaultSelectClause() {
detail.setDefaultSelectClause(beanDescriptor);
if (type != Type.ATTRIBUTE) {
detail.setDefaultSelectClause(beanDescriptor);
} else if (!detail.hasSelectClause()) {
// explicit empty select when single attribute query on non-root fetch path
detail.setEmptyBase();
}
}
@Override
@@ -1221,10 +1226,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
@Override
@SuppressWarnings("unchecked")
public <A> List<A> findSingleAttributeList() {
if (!detail.hasSelectClause()) {
// (no explicit select set - clear all properties)
detail.setBase(new OrmQueryProperties(null, new LinkedHashSet<>()));
}
return (List<A>) server.findSingleAttributeList(this, null);
}