Add table prefix to groupBy query (#10250)

Fixes #10092
directus · Dec 3, 2021 · a77f08b · a77f08b
1 parent 57bddf9
commit a77f08b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/api/src/utils/apply-query.ts b/api/src/utils/apply-query.ts
@@ -59,7 +59,7 @@ export default function applyQuery(
 	}
 
 	if (query.group) {
-		dbQuery.groupBy(query.group.map(applyFunctionToColumnName));
+		dbQuery.groupBy(`${collection}.${query.group.map(applyFunctionToColumnName)}`);
 	}
 
 	if (query.aggregate) {

diff --git a/api/src/utils/sanitize-query.ts b/api/src/utils/sanitize-query.ts
@@ -1,4 +1,4 @@
-import { flatten, get, merge, set } from 'lodash';
+import { flatten, get, isPlainObject, merge, set } from 'lodash';
 import logger from '../logger';
 import { Meta } from '../types';
 import { Query, Aggregate, Filter } from '@directus/shared/types';
@@ -184,7 +184,7 @@ function sanitizeDeep(deep: Record<string, any>, accountability?: Accountability
 				// way of knowing when to keep nesting and when to stop
 				const [parsedKey, parsedValue] = Object.entries(parsedSubQuery)[0];
 				parsedLevel[`_${parsedKey}`] = parsedValue;
-			} else {
+			} else if (isPlainObject(value)) {
 				parse(value, [...path, key]);
 			}
 		}