vona-module-a-orm 5.0.85 → 5.0.86

package/dist/bean/bean.database.d.ts

@@ -11,5 +11,4 @@ export declare class BeanDatabase extends BeanBase {
     getDialect(client: keyof IDatabaseClientDialectRecord): BeanDatabaseDialectBase;
     switchDbIsolate<RESULT>(fn: FunctionAsync<RESULT>, dbInfoOrClientName?: Partial<IDbInfo> | keyof IDatabaseClientRecord): Promise<RESULT>;
     switchDb<RESULT>(fn: FunctionAsync<RESULT>, dbInfoOrClientName?: Partial<IDbInfo> | keyof IDatabaseClientRecord): Promise<RESULT>;
-    private _prepareClientConfig;
 }

package/dist/bean/bean.databaseDialectBase.d.ts

@@ -6,8 +6,9 @@ import type { IDatabaseDialectCapabilities, IFetchDatabasesResultItem, IFetchInd
 import { BeanBase } from 'vona';
 export declare class BeanDatabaseDialectBase extends BeanBase {
     protected _capabilities?: IDatabaseDialectCapabilities;
+    protected _configBase?: Partial<ConfigDatabaseClient>;
     get capabilities(): IDatabaseDialectCapabilities;
-    getConfigBase(): ConfigDatabaseClient | undefined;
+    get configBase(): Partial<ConfigDatabaseClient> | undefined;
     fetchDatabases(_schemaBuilder: Knex.SchemaBuilder, _databasePrefix: string): Promise<IFetchDatabasesResultItem[]>;
     createDatabase(_schemaBuilder: Knex.SchemaBuilder, _databaseName: string): Promise<string>;
     dropDatabase(_schemaBuilder: Knex.SchemaBuilder, _databaseName: string): Promise<void>;

package/dist/index.js

@@ -190,20 +190,20 @@ let ServiceDatabase = (_dec$r = Service(), _dec2$r = BeanInfo({
   get configDatabase() {
     return this.app.config.database;
   }
-  getClientConfig(clientName, original = false) {
+  getClientConfig(clientName, clientConfig, original) {
     // clientConfig
-    let clientConfig = this.configDatabase.clients[clientName];
-    if (original) return clientConfig;
+    if (!clientConfig) {
+      clientConfig = this.configDatabase.clients[clientName];
+    }
     // check
     if (!clientConfig) {
       throw new Error(`database config not found: ${clientName}`);
     }
+    if (original) return clientConfig;
     // configBaseClient
     const dialect = this.bean.database.getDialect(clientConfig.client);
-    const configBaseClient = dialect.getConfigBase();
     // combine
-    const configBase = this.configDatabase.base;
-    clientConfig = deepExtend({}, configBase, configBaseClient, clientConfig);
+    clientConfig = deepExtend({}, this.configDatabase.base, dialect.configBase, clientConfig);
     // ready
     return clientConfig;
   }
@@ -689,8 +689,9 @@ let ServiceDatabaseClient = (_dec$k = Service(), _dec2$k = BeanInfo({
     }
   }
   async reload(clientConfig) {
+    const clientConfigReal = this.scope.service.database.getClientConfig(this.clientName, clientConfig);
     await this.__close();
-    this.__load(this.clientNameSelector, clientConfig);
+    this.__load(this.clientNameSelector, clientConfigReal);
   }
   getDatabaseName() {
     const connection = this.clientConfig.connection;
@@ -713,7 +714,7 @@ let ServiceDatabaseClient = (_dec$k = Service(), _dec2$k = BeanInfo({
     const connDatabaseName = this._prepareDatabaseName(databaseName);
     // set config
     //   * should not use this.clientConfig.connection, because password is hidden
-    const config = this.scope.service.database.getClientConfig(this.clientName, true);
+    const config = this.scope.service.database.getClientConfig(this.clientName, undefined, true);
     config.connection = Object.assign({}, config.connection, connDatabaseName);
     // only used by startup, so no consider that workers broadcast
     this.configDatabase.clients[this.clientName] = config;
@@ -732,7 +733,7 @@ let BeanDatabase = (_dec$j = Bean(), _dec2$j = BeanInfo({
   }
   getClient(dbInfoOrClientName, clientConfig) {
     const dbInfo = this.scope.service.database.prepareDbInfo(dbInfoOrClientName);
-    const clientConfigReal = this._prepareClientConfig(dbInfo.clientName, clientConfig);
+    const clientConfigReal = this.scope.service.database.getClientConfig(dbInfo.clientName, clientConfig);
     const selector = this.scope.service.database.prepareClientNameSelector(dbInfo, clientConfigReal.client);
     return this.app.bean._getBeanSelector(ServiceDatabaseClient, selector, clientConfigReal);
   }
@@ -766,11 +767,6 @@ let BeanDatabase = (_dec$j = Bean(), _dec2$j = BeanInfo({
       return this.bean._getBean(ServiceTransactionAsyncLocalStorage).run(fn);
     });
   }
-
-  // only for bean.database.getClient
-  _prepareClientConfig(clientName, clientConfig) {
-    return clientConfig ? deepExtend({}, clientConfig) : this.scope.service.database.getClientConfig(clientName);
-  }
 }) || _class$j) || _class$j);
 
 var _dec$i, _dec2$i, _dec3$7, _class$i;
@@ -780,13 +776,14 @@ let BeanDatabaseDialectBase = (_dec$i = Bean(), _dec2$i = Virtual(), _dec3$7 = B
   constructor(...args) {
     super(...args);
     this._capabilities = void 0;
+    this._configBase = void 0;
   }
   get capabilities() {
     if (!this._capabilities) throw new Error('Should provide dialect capabilities');
     return this._capabilities;
   }
-  getConfigBase() {
-    return undefined;
+  get configBase() {
+    return this._configBase;
   }
   async fetchDatabases(_schemaBuilder, _databasePrefix) {
     throw new Error('Not Implemented');

package/dist/service/database.d.ts

@@ -4,7 +4,7 @@ import type { IDatabaseClientDialectRecord, IDatabaseClientRecord, IDbInfo } fro
 import { BeanBase } from 'vona';
 export declare class ServiceDatabase extends BeanBase {
     get configDatabase(): import("../types/config.ts").ConfigDatabase;
-    getClientConfig(clientName: keyof IDatabaseClientRecord, original?: boolean): ConfigDatabaseClient;
+    getClientConfig(clientName: keyof IDatabaseClientRecord, clientConfig?: ConfigDatabaseClient, original?: boolean): ConfigDatabaseClient;
     prepareDbInfo(dbInfoOrClientName?: Partial<IDbInfo> | keyof IDatabaseClientRecord): IDbInfo;
     prepareClientNameSelector(dbInfo: IDbInfo, dialect: BeanDatabaseDialectBase | keyof IDatabaseClientDialectRecord): string;
     parseClientNameSelector(clientNameSelector: string): IDbInfo;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-orm",
   "type": "module",
-  "version": "5.0.85",
+  "version": "5.0.86",
   "title": "a-orm",
   "vonaModule": {
     "capabilities": {