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 nested relational limit for m2o fetching (#12235)

Browse Source 
Fixes #12134
This commit is contained in:
Rijk van Zanten
2022-03-18 16:27:25 -04:00
committed by GitHub
parent 4b6fa290f0
commit 2bb350f14f
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,6 +95,7 @@ export default async function runAST(
const node = merge({}, nestedNode, {
query: { limit: env.RELATIONAL_BATCH_SIZE, offset: batchCount * env.RELATIONAL_BATCH_SIZE },
});
nestedItems = (await runAST(node, schema, { knex, nested: true })) as Item[] | null;
if (nestedItems) {
@@ -108,7 +109,11 @@ export default async function runAST(
batchCount++;
}
} else {
nestedItems = (await runAST(nestedNode, schema, { knex, nested: true })) as Item[] | null;
const node = merge({}, nestedNode, {
query: { limit: -1 },
});
nestedItems = (await runAST(node, schema, { knex, nested: true })) as Item[] | null;
if (nestedItems) {
// Merge all fetched nested records with the parent items
@@ -341,12 +346,13 @@ function mergeWithParentItems(
});
parentItem[nestedNode.fieldKey].push(...itemChildren);
if (nestedNode.query.offset && nestedNode.query.offset >= 0) {
parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].slice(nestedNode.query.offset);
}
if (nestedNode.query.limit && nestedNode.query.limit >= 0) {
parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].slice(0, nestedNode.query.limit ?? 100);
}
parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].slice(0, nestedNode.query.limit ?? 100);
parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].sort((a: Item, b: Item) => {
// This is pre-filled in get-ast-from-query
const sortField = nestedNode.query.sort![0]!;