diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 13e4365fa..f8d7ff419 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -1186,7 +1186,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override @SuppressWarnings("unchecked") public List findSingleAttributeList(Query query, Transaction transaction) { - SpiOrmQueryRequest request = createQueryRequest(Type.ATTRIBUTE, query, transaction); + SpiOrmQueryRequest request = buildQueryRequest(Type.ATTRIBUTE, query, transaction); + request.query().setSingleAttribute(); + request.prepareQuery(); Object result = request.getFromQueryCache(); if (result != null) { return (List) result; @@ -1202,7 +1204,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override @SuppressWarnings("unchecked") public Set findSingleAttributeSet(Query query, Transaction transaction) { - SpiOrmQueryRequest request = createQueryRequest(Type.ATTRIBUTE_SET, query, transaction); + SpiOrmQueryRequest request = buildQueryRequest(Type.ATTRIBUTE_SET, query, transaction); + request.query().setSingleAttribute(); + request.prepareQuery(); Object result = request.getFromQueryCache(); if (result != null) { return (Set) result; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java index b32492cec..3ced1ac0b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java @@ -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(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 8c81ddd83..fac507f80 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -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 extends AbstractQuery implements SpiQuery { if (Mode.LAZYLOAD_MANY == mode) { return false; } else { - return !hasMaxRowsOrFirstRow() || isRawSql(); + return singleAttribute || !hasMaxRowsOrFirstRow() || isRawSql(); } } @@ -593,6 +596,7 @@ public class DefaultOrmQuery extends AbstractQuery implements SpiQuery { // clear select and fetch joins detail.clear(); select(beanDescriptor.idSelect()); + singleAttribute = true; } @Override @@ -636,7 +640,7 @@ public class DefaultOrmQuery extends AbstractQuery implements SpiQuery { 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 extends AbstractQuery implements SpiQuery { public final Set findSingleAttributeSet() { return (Set) server.findSingleAttributeSet(this, transaction); } + @Override public final A findSingleAttribute() { List list = findSingleAttributeList(); diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java index 6387885c7..91a02d52c 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java @@ -815,9 +815,26 @@ public class TestQuerySingleAttribute extends BaseTestCase { + "left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null order by t1.status") .doesNotContain("order by t0.id"); - assertThat(statusList).hasSize(7); + assertThat(statusList).hasSizeGreaterThan(6); assertThat(statusList.get(0)).isEqualTo(null); - assertThat(statusList.get(6)).isEqualTo(Order.Status.COMPLETE); + } + + @Test + void oneToMany_maxRows() { + ResetBasicData.reset(); + + Query query = DB.find(Customer.class) + .fetch("orders", "status") + .setMaxRows(2); + + List statusList = query.findSingleAttributeList(); + assertSql(query) + .contains("select t1.status from o_customer t0 " + + "left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null limit 2") + .doesNotContain("order by"); + // Results in java.lang.AssertionError: selectSql was null + // at io.ebeaninternal.server.query.SqlTree.getSelectSql(SqlTree.java:99) + assertThat(statusList).hasSize(2); } @BeforeEach