From 71e03c7bf2d1c89597c7d2322014f410e979fb9f Mon Sep 17 00:00:00 2001
From: Elizabeth <28875055+E1izabeth@users.noreply.github.com>
Date: Tue, 17 Dec 2024 18:09:09 +0300
Subject: [PATCH] dbeaver/dbeaver#36415 Add support for composite values to the
 grouping panel for DBeaver (#3137)

---
 .../src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java
index 36ff2f17d7..0308509dec 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java
@@ -560,7 +560,7 @@ public String generateGroupByQuery(
                 resultsInfo.getDataContainer(),
                 getSqlDialectFromConnection(dataSource.getContainer()),
                 contextInfo.getProcessor().getSyntaxManager(),
-                columnsList,
+                columnsList.stream().map(s -> SQLGroupingAttribute.makeCustom(dataSource, s)).toList(),
                 functions == null ? List.of(SQLGroupingQueryGenerator.DEFAULT_FUNCTION) : functions, // backward compatibility
                 CommonUtils.getBoolean(showDuplicatesOnly, false));
             return groupingQueryGenerator.generateGroupingQuery(resultsInfo.getQueryText());