From 1b9eb0f4b16e552ebcbced7a01eacd60da187bbe Mon Sep 17 00:00:00 2001
From: Oreille <33065839+Oreilles@users.noreply.github.com>
Date: Mon, 6 Dec 2021 18:55:33 +0100
Subject: [PATCH] Use expression instead of alias in groupBy query (#10339)

---
 api/src/utils/apply-query.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/api/src/utils/apply-query.ts b/api/src/utils/apply-query.ts
index 809914599f..a5498bfd81 100644
--- a/api/src/utils/apply-query.ts
+++ b/api/src/utils/apply-query.ts
@@ -5,7 +5,6 @@ import validate from 'uuid-validate';
 import { InvalidQueryException } from '../exceptions';
 import { Relation, SchemaOverview } from '../types';
 import { Aggregate, Filter, LogicalFilterAND, Query } from '@directus/shared/types';
-import { applyFunctionToColumnName } from './apply-function-to-column-name';
 import { getColumn } from './get-column';
 import { getRelationType } from './get-relation-type';
 import { getHelpers } from '../database/helpers';
@@ -59,7 +58,7 @@ export default function applyQuery(
 	}
 
 	if (query.group) {
-		dbQuery.groupBy(`${collection}.${query.group.map(applyFunctionToColumnName)}`);
+		dbQuery.groupBy(query.group.map((column) => getColumn(knex, collection, column, false)));
 	}
 
 	if (query.aggregate) {