mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-22 15:10:02 +00:00
#2756 - Fix for Bug findSingleAttributeList o2m maxrows
Allow maxRows use in this case
This commit is contained in:
commit
4ed5f91963
4 files changed
+34
-9
No files matched your search
@@ -1186,7 +1186,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
|
||||
@Override
|
||||
@SuppressWarnings("unchecked")
|
||||
public <A, T> List<A> findSingleAttributeList(Query<T> query, Transaction transaction) {
|
||||
SpiOrmQueryRequest<T> request = createQueryRequest(Type.ATTRIBUTE, query, transaction);
|
||||
SpiOrmQueryRequest<T> request = buildQueryRequest(Type.ATTRIBUTE, query, transaction);
|
||||
request.query().setSingleAttribute();
|
||||
request.prepareQuery();
|
||||
Object result = request.getFromQueryCache();
|
||||
if (result != null) {
|
||||
return (List<A>) result;
|
||||
@@ -1202,7 +1204,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
|
||||
@Override
|
||||
@SuppressWarnings("unchecked")
|
||||
public <A, T> Set<A> findSingleAttributeSet(Query<T> query, Transaction transaction) {
|
||||
SpiOrmQueryRequest<T> request = createQueryRequest(Type.ATTRIBUTE_SET, query, transaction);
|
||||
SpiOrmQueryRequest<T> request = buildQueryRequest(Type.ATTRIBUTE_SET, query, transaction);
|
||||
request.query().setSingleAttribute();
|
||||
request.prepareQuery();
|
||||
Object result = request.getFromQueryCache();
|
||||
if (result != null) {
|
||||
return (Set<A>) result;
|
||||
|
||||
@@ -178,7 +178,6 @@ final class CQueryBuilder {
|
||||
|
||||
CQueryFetchSingleAttribute buildFetchAttributeQuery(OrmQueryRequest<?> request) {
|
||||
SpiQuery<?> query = request.query();
|
||||
query.setSingleAttribute();
|
||||
if (!query.isIncludeSoftDeletes()) {
|
||||
BeanDescriptor<?> desc = request.descriptor();
|
||||
if (desc.isSoftDelete()) {
|
||||
@@ -561,7 +560,7 @@ final class CQueryBuilder {
|
||||
if (selectClause != null) {
|
||||
sb.append(selectClause);
|
||||
} else {
|
||||
useSqlLimiter = (query.hasMaxRowsOrFirstRow() && select.getManyProperty() == null);
|
||||
useSqlLimiter = (query.hasMaxRowsOrFirstRow() && (select.getManyProperty() == null || query.isSingleAttribute()));
|
||||
if (!useSqlLimiter) {
|
||||
appendSelectDistinct();
|
||||
}
|
||||
|
||||
@@ -15,7 +15,10 @@ import io.ebeaninternal.server.autotune.ProfilingListener;
|
||||
import io.ebeaninternal.server.core.SpiOrmQueryRequest;
|
||||
import io.ebeaninternal.server.deploy.*;
|
||||
import io.ebeaninternal.server.el.ElPropertyDeploy;
|
||||
import io.ebeaninternal.server.expression.*;
|
||||
import io.ebeaninternal.server.expression.DefaultExpressionList;
|
||||
import io.ebeaninternal.server.expression.IdInExpression;
|
||||
import io.ebeaninternal.server.expression.InExpression;
|
||||
import io.ebeaninternal.server.expression.SimpleExpression;
|
||||
import io.ebeaninternal.server.query.NativeSqlQueryPlanKey;
|
||||
import io.ebeaninternal.server.rawsql.SpiRawSql;
|
||||
import io.ebeaninternal.server.transaction.ExternalJdbcTransaction;
|
||||
@@ -504,7 +507,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
|
||||
if (Mode.LAZYLOAD_MANY == mode) {
|
||||
return false;
|
||||
} else {
|
||||
return !hasMaxRowsOrFirstRow() || isRawSql();
|
||||
return singleAttribute || !hasMaxRowsOrFirstRow() || isRawSql();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -593,6 +596,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
|
||||
// clear select and fetch joins
|
||||
detail.clear();
|
||||
select(beanDescriptor.idSelect());
|
||||
singleAttribute = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -636,7 +640,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
|
||||
if (singleExpression instanceof IdInExpression) {
|
||||
return new CacheIdLookupMany<>((IdInExpression) singleExpression);
|
||||
} else if (singleExpression instanceof InExpression) {
|
||||
InExpression in = (InExpression)singleExpression;
|
||||
InExpression in = (InExpression) singleExpression;
|
||||
if (in.property().equals(beanDescriptor.idName())) {
|
||||
return new CacheIdLookupMany<>(in);
|
||||
}
|
||||
@@ -1502,6 +1506,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
|
||||
public final <A> Set<A> findSingleAttributeSet() {
|
||||
return (Set<A>) server.findSingleAttributeSet(this, transaction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public final <A> A findSingleAttribute() {
|
||||
List<A> list = findSingleAttributeList();
|
||||
|
||||
Reference in new issue
Block a user