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

NPE Fix with .setCountDistinct(CountDistinctOrder.NO_ORDERING)

Browse Source
This commit is contained in:
Noemi Szemenyei
2021-11-22 08:30:50 +01:00
parent 6ea8f5c12b
commit ba80ae20f4
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+2
View File
@@ -736,6 +736,8 @@ final class CQueryBuilder {
return " order by count(*) desc, r1.attribute_";
case COUNT_DESC_ATTR_DESC:
return " order by count(*) desc, r1.attribute_ desc";
case NO_ORDERING:
return "";
default:
throw new IllegalArgumentException("Illegal enum: " + orderBy);
}
ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
+8
View File
@@ -646,6 +646,14 @@ public class TestQuerySingleAttribute extends BaseTestCase {
.findSingleAttributeList();
assertThat(list1.get(0)).isInstanceOf(CountedValue.class);
//assertThat(list1.toString()).isEqualTo("[1: Tracy, 3: Jim1, 1: Jack, 3: Fred1, 1: Fiona, 3: Bugs1]");
query = DB.find(Contact.class).select("firstName");
list1 = query
.setCountDistinct(CountDistinctOrder.NO_ORDERING)
.findSingleAttributeList();
assertThat(list1.get(0)).isInstanceOf(CountedValue.class);
assertThat(sqlOf(query)).contains("select r1.attribute_, count(*) from ("
+ "select t0.first_name as attribute_ from contact t0");
query = DB.find(Contact.class).select("firstName");
list1 = query