From ba2e56e43cff778ac84d1fc215bc93f109da0e99 Mon Sep 17 00:00:00 2001 From: Rijk van Zanten Date: Fri, 21 May 2021 13:57:42 -0400 Subject: [PATCH] Fix collection delete for collections w/ m2o to them (#5809) * Fix new-collection relational field creation * Fix collection delete for collections w/ m2o to them Fixes #5793 --- .changeset/forty-birds-wonder.md | 5 +++++ api/src/services/fields.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/forty-birds-wonder.md diff --git a/.changeset/forty-birds-wonder.md b/.changeset/forty-birds-wonder.md new file mode 100644 index 0000000000..990b771b0b --- /dev/null +++ b/.changeset/forty-birds-wonder.md @@ -0,0 +1,5 @@ +--- +'directus': patch +--- + +Fixed issue that would prevent collections that had a relationship pointing to them from being deleted. diff --git a/api/src/services/fields.ts b/api/src/services/fields.ts index 22c492c908..4c26146ff0 100644 --- a/api/src/services/fields.ts +++ b/api/src/services/fields.ts @@ -378,7 +378,7 @@ export class FieldsService { // Cleanup directus_fields const metaRow = await trx.select('id').from('directus_fields').where({ collection, field }).first(); - if (metaRow.id) { + if (metaRow?.id) { // Handle recursive FK constraints await trx('directus_fields').update({ group: null }).where({ group: metaRow.id }); }