github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix o2m fetch when not grouping

Browse Source
This commit is contained in:
rijkvanzanten
2021-05-27 12:25:30 -04:00
parent 7a81340271
commit c16063f14b
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
api/src/database/run-ast.ts
View File

@@ -58,7 +58,8 @@ export default async function runAST(
const { columnsToSelect, primaryKeyField, nestedCollectionNodes } = await parseCurrentLevel(
schema,
collection,
children
children,
query
);
// The actual knex query builder instance. This is a promise that resolves with the raw items from the db
@@ -101,7 +102,8 @@ export default async function runAST(
async function parseCurrentLevel(
schema: SchemaOverview,
collection: string,
children: (NestedCollectionNode | FieldNode)[]
children: (NestedCollectionNode | FieldNode)[],
query: Query
) {
const primaryKeyField = schema.collections[collection].primary;
const columnsInCollection = Object.keys(schema.collections[collection].fields);
@@ -133,10 +135,11 @@ async function parseCurrentLevel(
}
/**
* Always fetch primary key in case there's a nested relation that needs it
* Always fetch primary key in case there's a nested relation that needs it, but only if there's
* no aggregation / grouping going on
*/
const childrenContainRelational = children.some((child) => child.type !== 'field');
if (childrenContainRelational && columnsToSelectInternal.includes(primaryKeyField) === false) {
const hasAggregationOrGrouping = 'aggregate' in query || 'group' in query;
if (columnsToSelectInternal.includes(primaryKeyField) === false && hasAggregationOrGrouping === false) {
columnsToSelectInternal.push(primaryKeyField);
}