fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-01 18:52:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert(server): revert create database api

Browse Source
This commit is contained in:
mytharcher 2025-06-30 23:29:36 +08:00
parent d486d13d39
commit 510767eb9f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/server/src/application.ts
View File

@ -1294,7 +1294,7 @@ export class Application<StateT = DefaultState, ContextT = DefaultContext> exten
protected createMainDataSource(options: ApplicationOptions) { protected createMainDataSource(options: ApplicationOptions) {
const mainDataSourceInstance = new MainDataSource({ const mainDataSourceInstance = new MainDataSource({
name: 'main', name: 'main',
database: this.createDatabase(options.database), database: this.createDatabase(options),
acl: createACL(), acl: createACL(),
resourceManager: createResourcer(options), resourceManager: createResourcer(options),
useACL: options.acl, useACL: options.acl,
@ -1309,7 +1309,7 @@ export class Application<StateT = DefaultState, ContextT = DefaultContext> exten
this.dataSourceManager.dataSources.set('main', mainDataSourceInstance); this.dataSourceManager.dataSources.set('main', mainDataSourceInstance);
} }
protected createDatabase(options: IDatabaseOptions | Database): Database { protected createDatabase(options: ApplicationOptions) {
const logging = (...args) => { const logging = (...args) => {
let msg = args[0]; let msg = args[0];
@ -1330,7 +1330,7 @@ export class Application<StateT = DefaultState, ContextT = DefaultContext> exten
this._sqlLogger.debug(content); 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({ const db = new Database({
...dbOptions, ...dbOptions,
logging: dbOptions.logging ? logging : false, logging: dbOptions.logging ? logging : false,