Merge pull request #3559 from ebean-orm/feature/findCount-noId

FindCount on entity bean without @id + platform wants column alias

Author: rbygrave

ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java

@@ -242,7 +242,7 @@ <T> CQueryRowCount buildRowCountQuery(OrmQueryRequest<T> request) {
     boolean withAgg = false;
     if (!countDistinct) {
       withAgg = includesAggregation(request, query);
-      if (!withAgg) {
+      if (!withAgg && request.descriptor().hasId()) {
         // minimise select clause for standard count
         query.setSelectId();
         useColumnAlias = false;

ebean-test/src/test/java/org/tests/query/TestRowCount.java

@@ -8,6 +8,7 @@
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
+import org.tests.model.noid.NoIdBean;
 
 import java.util.List;
 
@@ -101,4 +102,27 @@ void find_count_distinct_multiplePropertiesSameColumn() {
     assertThat(count).isGreaterThan(0);
   }
 
+  @Test
+  void find_count_noIdProperty() {
+    LoggedSql.start();
+
+    DB.find(NoIdBean.class)
+    .select("name, subject")
+    .findCount();
+
+    DB.find(NoIdBean.class)
+    .setDistinct(true)
+    .select("name, subject")
+    .findCount();
+
+    List<String> sql = LoggedSql.stop();
+
+    assertThat(sql.get(0)).contains("select count(*) from noidbean t0");
+    if (isSqlServer() || isH2() || isMariaDB() || isMySql()) {
+      assertThat(sql.get(1)).contains("select count(*) from ( select distinct t0.name c0, t0.subject c1 from noidbean t0)");
+    } else {
+      assertThat(sql.get(1)).contains("select count(*) from ( select distinct t0.name, t0.subject from noidbean t0)");
+    }
+  }
+
 }