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

Warn, don't error, on missing PKs in schema

Browse Source 
Fixes #3251
This commit is contained in:
rijkvanzanten
2020-12-07 18:24:33 -05:00
parent 9e3f579b22
commit 5bedda945c
2 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,27 +23,11 @@ export default async function runAST(
const knex = options?.knex || database;
for (const [collection, info] of Object.entries(schema)) {
if (!info.primary) {
throw new ServiceUnavailableException(
`Collection "${collection}" doesn't have a primary key column`,
{
service: 'database',
table: collection,
}
);
}
}
if (ast.type === 'm2a') {
const results: { [collection: string]: null | Item | Item[] } = {};
for (const collection of ast.names) {
results[collection] = await run(
collection,
ast.children[collection],
ast.query[collection]
);
results[collection] = await run(collection, ast.children[collection], ast.query[collection]);
}
return results;
@@ -201,9 +185,9 @@ function applyParentFilters(
filter: {
...(nestedNode.query.filter || {}),
[nestedNode.relation.one_primary!]: {
_in: uniq(
parentItems.map((res) => res[nestedNode.relation.many_field])
).filter((id) => id),
_in: uniq(parentItems.map((res) => res[nestedNode.relation.many_field])).filter(
(id) => id
),
},
},
};
@@ -221,9 +205,7 @@ function applyParentFilters(
filter: {
...(nestedNode.query.filter || {}),
[nestedNode.relation.many_field]: {
_in: uniq(parentItems.map((res) => res[nestedNode.parentKey])).filter(
(id) => id
),
_in: uniq(parentItems.map((res) => res[nestedNode.parentKey])).filter((id) => id),
},
},
};
@@ -269,9 +251,7 @@ function mergeWithParentItems(
if (nestedNode.type === 'm2o') {
for (const parentItem of parentItems) {
const itemChild = nestedItems.find((nestedItem) => {
return (
nestedItem[nestedNode.relation.one_primary!] == parentItem[nestedNode.fieldKey]
);
return nestedItem[nestedNode.relation.one_primary!] == parentItem[nestedNode.fieldKey];
});
parentItem[nestedNode.fieldKey] = itemChild || null;
@@ -285,9 +265,8 @@ function mergeWithParentItems(
return (
nestedItem[nestedNode.relation.many_field] ==
parentItem[nestedNode.relation.one_primary!] ||
nestedItem[nestedNode.relation.many_field]?.[
nestedNode.relation.one_primary!
] == parentItem[nestedNode.relation.one_primary!]
nestedItem[nestedNode.relation.many_field]?.[nestedNode.relation.one_primary!] ==
parentItem[nestedNode.relation.one_primary!]
);
});
@@ -306,8 +285,7 @@ function mergeWithParentItems(
const itemChild = (nestedItem as Record<string, any[]>)[relatedCollection].find(
(nestedItem) => {
return (
nestedItem[nestedNode.relatedKey[relatedCollection]] ==
parentItem[nestedNode.fieldKey]
nestedItem[nestedNode.relatedKey[relatedCollection]] == parentItem[nestedNode.fieldKey]
);
}
);
@@ -334,8 +312,7 @@ function removeTemporaryFields(
for (const relatedCollection of ast.names) {
if (!fields[relatedCollection]) fields[relatedCollection] = [];
if (!nestedCollectionNodes[relatedCollection])
nestedCollectionNodes[relatedCollection] = [];
if (!nestedCollectionNodes[relatedCollection]) nestedCollectionNodes[relatedCollection] = [];
for (const child of ast.children[relatedCollection]) {
if (child.type === 'field') {

11
api/src/middleware/schema.ts
View File

@@ -1,9 +1,20 @@
import { RequestHandler } from 'express';
import asyncHandler from 'express-async-handler';
import { schemaInspector } from '../database';
import logger from '../logger';
const getSchema: RequestHandler = asyncHandler(async (req, res, next) => {
const schemaOverview = await schemaInspector.overview();
for (const [collection, info] of Object.entries(schemaOverview)) {
if (!info.primary) {
logger.warn(
`Collection "${collection}" doesn't have a primary key column and will be ignored`
);
delete schemaOverview[collection];
}
}
req.schema = schemaOverview;
return next();