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

Fix couple hiccups, support *

Browse Source
This commit is contained in:
rijkvanzanten
2020-07-14 17:13:37 -04:00
parent 54a2b3b74d
commit dd6c7043ac
3 changed files with 28 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/database/run-ast.ts
View File

@@ -15,7 +15,7 @@ export default async function runAST(ast: AST, query = ast.query) {
for (const child of ast.children) {
if (child.type === 'field') {
if (columnsInCollection.includes(child.name)) {
if (columnsInCollection.includes(child.name) || child.name === '*') {
toplevelFields.push(child.name);
}
@@ -181,6 +181,10 @@ export default async function runAST(ast: AST, query = ast.query) {
const nestedCollectionKeys = nestedCollections.map(({ fieldKey }) => fieldKey);
if (toplevelFields.includes('*')) {
return results;
}
return results.map((result) =>
pick(result, uniq([...nestedCollectionKeys, ...toplevelFields]))
);