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 1/2] 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()); From 855d5914ef5221b4d23e288e0f53d4e9430b47d5 Mon Sep 17 00:00:00 2001 From: Sychev Andrey <44414066+SychevAndrey@users.noreply.github.com> Date: Tue, 17 Dec 2024 16:43:53 +0100 Subject: [PATCH 2/2] CB-5074 fix: temporary fix of setting undefined as locale (#3139) Co-authored-by: Evgenia <139753579+EvgeniaBzzz@users.noreply.github.com> Co-authored-by: sergeyteleshev --- webapp/packages/core-root/src/SessionResource.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/packages/core-root/src/SessionResource.ts b/webapp/packages/core-root/src/SessionResource.ts index ba8d504058..7998b40ee3 100644 --- a/webapp/packages/core-root/src/SessionResource.ts +++ b/webapp/packages/core-root/src/SessionResource.ts @@ -74,7 +74,8 @@ export class SessionResource extends CachedDataResource { async changeLanguage(locale: string): Promise { await this.load(); - if (this.data?.locale === locale) { + //TODO we check "!locale" because of the bug described in CB-6048, should be removed when fixed + if (this.data?.locale === locale || !locale) { return; } await this.graphQLService.sdk.changeSessionLanguage({ locale });