From 59db7a34dce8d572f66d1b290ac934ed2937bf02 Mon Sep 17 00:00:00 2001 From: chenos Date: Thu, 17 Dec 2020 21:47:23 +0800 Subject: [PATCH] fix: model is not null --- packages/database/src/database.ts | 5 ++++- packages/database/src/table.ts | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/database/src/database.ts b/packages/database/src/database.ts index b1f516552..75bd693df 100644 --- a/packages/database/src/database.ts +++ b/packages/database/src/database.ts @@ -239,7 +239,10 @@ export default class Database { } for (const name of names) { // @ts-ignore - sequelize.modelManager.addModel(this.getModel(name)); + const model = this.getModel(name); + if (model) { + sequelize.modelManager.addModel(model); + } } await sequelize.sync(restOptions); await sequelize.close(); diff --git a/packages/database/src/table.ts b/packages/database/src/table.ts index 278cf9a8a..487108aea 100644 --- a/packages/database/src/table.ts +++ b/packages/database/src/table.ts @@ -238,12 +238,13 @@ export class Table { */ public getRelatedTableNames(): Set { const names = new Set(); - names.add(this.options.name); + this.options.name && names.add(this.options.name); for (const association of this.associations.values()) { const target = association.getTarget(); - names.add(target); + target && names.add(target); if (association instanceof BELONGSTOMANY) { - names.add(association.getThroughName()); + const throughName = association.getThroughName(); + throughName && names.add(throughName); } } return names;