github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-24 10:28:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:directus/directus into main

Browse Source
This commit is contained in:
rijkvanzanten
2021-02-17 19:01:05 -05:00
parent 1624681487 d95ab172bd
commit 930028b083
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,13 +96,13 @@ async function parseCurrentLevel(
const primaryKeyField = schema.tables[collection].primary;
const columnsInCollection = Object.keys(schema.tables[collection].columns);
const columnsToSelect: string[] = [];
const columnsToSelectInternal: string[] = [];
const nestedCollectionNodes: NestedCollectionNode[] = [];
for (const child of children) {
if (child.type === 'field') {
if (columnsInCollection.includes(child.name) || child.name === '*') {
columnsToSelect.push(child.name);
columnsToSelectInternal.push(child.name);
}
continue;
@@ -111,22 +111,25 @@ async function parseCurrentLevel(
if (!child.relation) continue;
if (child.type === 'm2o') {
columnsToSelect.push(child.relation.many_field);
columnsToSelectInternal.push(child.relation.many_field);
}
if (child.type === 'm2a') {
columnsToSelect.push(child.relation.many_field);
columnsToSelect.push(child.relation.one_collection_field!);
columnsToSelectInternal.push(child.relation.many_field);
columnsToSelectInternal.push(child.relation.one_collection_field!);
}
nestedCollectionNodes.push(child);
}
/** Always fetch primary key in case there's a nested relation that needs it */
if (columnsToSelect.includes(primaryKeyField) === false) {
columnsToSelect.push(primaryKeyField);
if (columnsToSelectInternal.includes(primaryKeyField) === false) {
columnsToSelectInternal.push(primaryKeyField);
}
/** Make sure select list has unique values */
const columnsToSelect = [...new Set(columnsToSelectInternal)];
return { columnsToSelect, nestedCollectionNodes, primaryKeyField };
}