From 510767eb9f19ee89b20c0b33ed79d8ac6aea3034 Mon Sep 17 00:00:00 2001 From: mytharcher Date: Mon, 30 Jun 2025 23:29:36 +0800 Subject: [PATCH] revert(server): revert create database api --- packages/core/server/src/application.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core/server/src/application.ts b/packages/core/server/src/application.ts index a1a0acae71..574dd5f4af 100644 --- a/packages/core/server/src/application.ts +++ b/packages/core/server/src/application.ts @@ -1294,7 +1294,7 @@ export class Application exten protected createMainDataSource(options: ApplicationOptions) { const mainDataSourceInstance = new MainDataSource({ name: 'main', - database: this.createDatabase(options.database), + database: this.createDatabase(options), acl: createACL(), resourceManager: createResourcer(options), useACL: options.acl, @@ -1309,7 +1309,7 @@ export class Application exten this.dataSourceManager.dataSources.set('main', mainDataSourceInstance); } - protected createDatabase(options: IDatabaseOptions | Database): Database { + protected createDatabase(options: ApplicationOptions) { const logging = (...args) => { let msg = args[0]; @@ -1330,7 +1330,7 @@ export class Application exten this._sqlLogger.debug(content); }; - const dbOptions = options instanceof Database ? options.options : options; + const dbOptions = options.database instanceof Database ? options.database.options : options.database; const db = new Database({ ...dbOptions, logging: dbOptions.logging ? logging : false,