Use expression instead of alias in groupBy query (#10339)

This commit is contained in:
Oreille
2021-12-06 18:55:33 +01:00
committed by GitHub
parent 500d57073c
commit 1b9eb0f4b1

View File

@@ -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) {