From dd26dc342d9bc16657548c199bb24a7b77ecce41 Mon Sep 17 00:00:00 2001
From: Noemi Szemenyei <noemi.szemenyei@foconis.de>
Date: Tue, 25 Jan 2022 08:53:21 +0100
Subject: [PATCH] FIX: select properties of the embedded Id

(cherry picked from commit 58e952b1ec9125dfccedcb04485913fbcc67932f)
---
 .../io/ebeaninternal/server/query/CQueryBuilder.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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 278603f5b..45657fb9c 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
@@ -568,8 +568,16 @@ final class CQueryBuilder {
         if (countSingleAttribute) {
           sb.append("r1.attribute_, count(*) from (select ");
           if (distinct) {
-            sb.append("distinct t0.");
-            sb.append(request.descriptor().idProperty().dbColumn()).append(", ");
+            sb.append("distinct ");
+            BeanProperty idProp = request.descriptor().idProperty();
+            if (idProp.isEmbedded()) {
+              BeanProperty[] props = ((BeanPropertyAssocOne<?>) idProp).properties();
+              for (BeanProperty prop : props) {
+                sb.append("t0.").append(prop.dbColumn()).append(", ");
+              }
+            } else {
+              sb.append("t0.").append(idProp.dbColumn()).append(", ");
+            }
           }
           sb.append(select.getSelectSql()).append(" as attribute_");
         } else {