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

Fix double drop relation

Browse Source
This commit is contained in:
rijkvanzanten
2021-08-19 17:11:49 -04:00
parent c1c05d4c4f
commit 256139ffd2
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/database/index.ts
View File

@@ -54,7 +54,12 @@ export default function getDatabase(): Knex {
connection: env.DB_CONNECTION_STRING || connectionConfig,
log: {
warn: (msg) => {
// Ignore warnings about returning not being supported in some DBs
if (msg.startsWith('.returning()')) return;
// Ignore warning about MySQL not supporting TRX for DDL
if (msg.startsWith('Transaction was implicitly committed, do not mix transactions and DDL with MySQL')) return;
return logger.warn(msg);
},
error: (msg) => logger.error(msg),

9
api/src/services/collections.ts
View File

@@ -414,15 +414,6 @@ export class CollectionsService {
if (relation.related_collection === collectionKey) {
await fieldsService.deleteField(relation.collection, relation.field);
}
const isM2O = relation.collection === collectionKey;
// Delete any fields that have a relationship to/from the current collection
if (isM2O && relation.related_collection && relation.meta?.one_field) {
await fieldsService.deleteField(relation.related_collection!, relation.meta.one_field);
} else {
await fieldsService.deleteField(relation.collection, relation.field);
}
}
const m2aRelationsThatIncludeThisCollection = this.schema.relations.filter((relation) => {