fix(core): allow merge implicit database bindings

koishijs · Mar 13, 2020 · 238f855 · 238f855
1 parent 067d9c4
commit 238f855
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/koishi-core/src/database.ts b/packages/koishi-core/src/database.ts
@@ -232,7 +232,7 @@ class DatabaseManager {
 
   injectMethods <S extends SubdatabaseType, T extends TableType> (sub: S, table: T, methods: any) {
     const subdatabase = this.database[sub] as AbstractDatabase
-    if (!this.explicitTables[table] && this.implicitTables[table]) {
+    if (!this.explicitTables[table] && this.implicitTables[table] && this.implicitTables[table] !== sub) {
       throw new Error(`database "${this.implicitTables[table]}" and "${sub}" conflict on table "${table}"`)
     } else if (!this.explicitTables[table] || this.explicitTables[table] === sub) {
       this.implicitTables[table] = sub