vona-module-a-orm 5.0.57 → 5.0.58

package/dist/.metadata/index.d.ts

@@ -86,11 +86,13 @@ declare module 'vona' {
 /** service: end */
 /** broadcast: begin */
 export * from '../bean/broadcast.columnsClear.ts';
+export * from '../bean/broadcast.databaseClientDispose.ts';
 export * from '../bean/broadcast.databaseClientReload.ts';
 import { type IDecoratorBroadcastOptions } from 'vona-module-a-broadcast';
 declare module 'vona-module-a-broadcast' {
     interface IBroadcastRecord {
         'a-orm:columnsClear': IDecoratorBroadcastOptions;
+        'a-orm:databaseClientDispose': IDecoratorBroadcastOptions;
         'a-orm:databaseClientReload': IDecoratorBroadcastOptions;
     }
 }
@@ -101,6 +103,12 @@ declare module 'vona-module-a-orm' {
         get $beanFullName(): 'a-orm.broadcast.columnsClear';
         get $onionName(): 'a-orm:columnsClear';
     }
+    interface BroadcastDatabaseClientDispose {
+    }
+    interface BroadcastDatabaseClientDispose {
+        get $beanFullName(): 'a-orm.broadcast.databaseClientDispose';
+        get $onionName(): 'a-orm:databaseClientDispose';
+    }
     interface BroadcastDatabaseClientReload {
     }
     interface BroadcastDatabaseClientReload {
@@ -111,15 +119,18 @@ declare module 'vona-module-a-orm' {
 /** broadcast: end */
 /** broadcast: begin */
 import type { BroadcastColumnsClear } from '../bean/broadcast.columnsClear.ts';
+import type { BroadcastDatabaseClientDispose } from '../bean/broadcast.databaseClientDispose.ts';
 import type { BroadcastDatabaseClientReload } from '../bean/broadcast.databaseClientReload.ts';
 export interface IModuleBroadcast {
     'columnsClear': BroadcastColumnsClear;
+    'databaseClientDispose': BroadcastDatabaseClientDispose;
     'databaseClientReload': BroadcastDatabaseClientReload;
 }
 /** broadcast: end */
 /** event: begin */
 export * from '../bean/event.clientNameReal.ts';
 export * from '../bean/event.columnsClear.ts';
+export * from '../bean/event.databaseClientDispose.ts';
 export * from '../bean/event.databaseClientReload.ts';
 import 'vona';
 declare module 'vona' {
@@ -137,6 +148,12 @@ declare module 'vona-module-a-orm' {
         get $beanFullName(): 'a-orm.event.columnsClear';
         get $onionName(): 'a-orm:columnsClear';
     }
+    interface EventDatabaseClientDispose {
+    }
+    interface EventDatabaseClientDispose {
+        get $beanFullName(): 'a-orm.event.databaseClientDispose';
+        get $onionName(): 'a-orm:databaseClientDispose';
+    }
     interface EventDatabaseClientReload {
     }
     interface EventDatabaseClientReload {
@@ -148,22 +165,26 @@ declare module 'vona-module-a-orm' {
 /** event: begin */
 import type { EventClientNameReal } from '../bean/event.clientNameReal.ts';
 import type { EventColumnsClear } from '../bean/event.columnsClear.ts';
+import type { EventDatabaseClientDispose } from '../bean/event.databaseClientDispose.ts';
 import type { EventDatabaseClientReload } from '../bean/event.databaseClientReload.ts';
 export interface IModuleEvent {
     'clientNameReal': EventClientNameReal;
     'columnsClear': EventColumnsClear;
+    'databaseClientDispose': EventDatabaseClientDispose;
     'databaseClientReload': EventDatabaseClientReload;
 }
 /** event: end */
 /** event: begin */
 import type { TypeEventClientNameRealData, TypeEventClientNameRealResult } from '../bean/event.clientNameReal.ts';
 import type { TypeEventColumnsClearData, TypeEventColumnsClearResult } from '../bean/event.columnsClear.ts';
+import type { TypeEventDatabaseClientDisposeData, TypeEventDatabaseClientDisposeResult } from '../bean/event.databaseClientDispose.ts';
 import type { TypeEventDatabaseClientReloadData, TypeEventDatabaseClientReloadResult } from '../bean/event.databaseClientReload.ts';
 import type { EventOn } from 'vona-module-a-event';
 declare module 'vona-module-a-event' {
     interface IEventRecord {
         'a-orm:clientNameReal': EventOn<TypeEventClientNameRealData, TypeEventClientNameRealResult>;
         'a-orm:columnsClear': EventOn<TypeEventColumnsClearData, TypeEventColumnsClearResult>;
+        'a-orm:databaseClientDispose': EventOn<TypeEventDatabaseClientDisposeData, TypeEventDatabaseClientDisposeResult>;
         'a-orm:databaseClientReload': EventOn<TypeEventDatabaseClientReloadData, TypeEventDatabaseClientReloadResult>;
     }
 }

package/dist/bean/broadcast.databaseClientDispose.d.ts

@@ -0,0 +1,9 @@
+import type { IBroadcastExecute } from 'vona-module-a-broadcast';
+import type { IDatabaseClientRecord } from '../types/database.ts';
+import { BeanBroadcastBase } from 'vona-module-a-broadcast';
+export interface TypeBroadcastDatabaseClientDisposeJobData {
+    clientName?: keyof IDatabaseClientRecord;
+}
+export declare class BroadcastDatabaseClientDispose extends BeanBroadcastBase<TypeBroadcastDatabaseClientDisposeJobData> implements IBroadcastExecute<TypeBroadcastDatabaseClientDisposeJobData> {
+    execute(data: TypeBroadcastDatabaseClientDisposeJobData, isEmitter?: boolean): Promise<void>;
+}

package/dist/bean/event.databaseClientDispose.d.ts

@@ -0,0 +1,8 @@
+import type { IDatabaseClientRecord } from '../types/database.ts';
+import { BeanEventBase } from 'vona-module-a-event';
+export interface TypeEventDatabaseClientDisposeData {
+    clientName: keyof IDatabaseClientRecord;
+}
+export type TypeEventDatabaseClientDisposeResult = void;
+export declare class EventDatabaseClientDispose extends BeanEventBase<TypeEventDatabaseClientDisposeData, TypeEventDatabaseClientDisposeResult> {
+}

package/dist/index.js

@@ -17,21 +17,21 @@ import { configAllWithIgnoreNull, configAll, configRedisWithIgnoreNull, configRe
 import { ServiceDatabaseAsyncLocalStorage as ServiceDatabaseAsyncLocalStorage$1, ServiceTransactionConsistency‌ as ServiceTransactionConsistency_ } from 'vona-module-a-orm';
 import { mutate } from 'mutate-on-copy';
 
-var _dec$x, _dec2$x, _class$x;
-let AopMethodTransaction = (_dec$x = AopMethod(), _dec2$x = BeanInfo({
+var _dec$z, _dec2$z, _class$z;
+let AopMethodTransaction = (_dec$z = AopMethod(), _dec2$z = BeanInfo({
   module: "a-orm"
-}), _dec$x(_class$x = _dec2$x(_class$x = class AopMethodTransaction extends BeanAopMethodBase {
+}), _dec$z(_class$z = _dec2$z(_class$z = class AopMethodTransaction extends BeanAopMethodBase {
   execute(options, _args, next, _receiver, _prop) {
     return this.bean.database.current.transaction.begin(() => {
       return next();
     }, options);
   }
-}) || _class$x) || _class$x);
+}) || _class$z) || _class$z);
 
-var _dec$w, _dec2$w, _class$w;
-let ServiceDatabaseAsyncLocalStorage = (_dec$w = Service(), _dec2$w = BeanInfo({
+var _dec$y, _dec2$y, _class$y;
+let ServiceDatabaseAsyncLocalStorage = (_dec$y = Service(), _dec2$y = BeanInfo({
   module: "a-orm"
-}), _dec$w(_class$w = _dec2$w(_class$w = class ServiceDatabaseAsyncLocalStorage extends BeanBase {
+}), _dec$y(_class$y = _dec2$y(_class$y = class ServiceDatabaseAsyncLocalStorage extends BeanBase {
   constructor(...args) {
     super(...args);
     this.dbStorage = void 0;
@@ -50,14 +50,14 @@ let ServiceDatabaseAsyncLocalStorage = (_dec$w = Service(), _dec2$w = BeanInfo({
       return fn();
     });
   }
-}) || _class$w) || _class$w);
+}) || _class$y) || _class$y);
 
-var _dec$v, _dec2$v, _class$v;
+var _dec$x, _dec2$x, _class$x;
 const SymbolColumnsCache = Symbol('SymbolColumnsCache');
 const SymbolColumnsDefaultCache = Symbol('SymbolColumnsDefaultCache');
-let ServiceColumnsCache = (_dec$v = Service(), _dec2$v = BeanInfo({
+let ServiceColumnsCache = (_dec$x = Service(), _dec2$x = BeanInfo({
   module: "a-orm"
-}), _dec$v(_class$v = _dec2$v(_class$v = class ServiceColumnsCache extends BeanBase {
+}), _dec$x(_class$x = _dec2$x(_class$x = class ServiceColumnsCache extends BeanBase {
   constructor(...args) {
     super(...args);
     this.clientName = void 0;
@@ -112,12 +112,12 @@ let ServiceColumnsCache = (_dec$v = Service(), _dec2$v = BeanInfo({
       return exists;
     }
   }
-}) || _class$v) || _class$v);
+}) || _class$x) || _class$x);
 
-var _dec$u, _dec2$u, _class$u;
-let ServiceColumns = (_dec$u = Service(), _dec2$u = BeanInfo({
+var _dec$w, _dec2$w, _class$w;
+let ServiceColumns = (_dec$w = Service(), _dec2$w = BeanInfo({
   module: "a-orm"
-}), _dec$u(_class$u = _dec2$u(_class$u = class ServiceColumns extends BeanBase {
+}), _dec$w(_class$w = _dec2$w(_class$w = class ServiceColumns extends BeanBase {
   constructor(...args) {
     super(...args);
     this._db = void 0;
@@ -168,7 +168,7 @@ let ServiceColumns = (_dec$u = Service(), _dec2$u = BeanInfo({
   columnsClear(tableName) {
     return this.scope.service.database.columnsClear(this.db.clientName, tableName);
   }
-}) || _class$u) || _class$u);
+}) || _class$w) || _class$w);
 
 const TransactionIsolationLevelsMap = {
   DEFAULT: undefined,
@@ -181,10 +181,13 @@ const TransactionIsolationLevelsMap = {
 
 // export type TransactionPropagation=''
 
-var _dec$t, _dec2$t, _class$t;
-let ServiceDatabase = (_dec$t = Service(), _dec2$t = BeanInfo({
+var _dec$v, _dec2$v, _class$v;
+let ServiceDatabase = (_dec$v = Service(), _dec2$v = BeanInfo({
   module: "a-orm"
-}), _dec$t(_class$t = _dec2$t(_class$t = class ServiceDatabase extends BeanBase {
+}), _dec$v(_class$v = _dec2$v(_class$v = class ServiceDatabase extends BeanBase {
+  get configDatabase() {
+    return this.app.config.database;
+  }
   getDialect(client) {
     if (!client) throw new Error('database dialect not specified');
     const beanFullName = this.scope.config.dialects[client];
@@ -192,6 +195,23 @@ let ServiceDatabase = (_dec$t = Service(), _dec2$t = BeanInfo({
     if (!dialect) throw new Error(`database dialect not found: ${client}`);
     return dialect;
   }
+  getClientConfig(clientName, original = false) {
+    // clientConfig
+    let clientConfig = this.configDatabase.clients[clientName];
+    if (original) return clientConfig;
+    // check
+    if (!clientConfig) {
+      throw new Error(`database config not found: ${clientName}`);
+    }
+    // configBaseClient
+    const dialect = this.scope.service.database.getDialect(clientConfig.client);
+    const configBaseClient = dialect.getConfigBase();
+    // combine
+    const configBase = this.configDatabase.base;
+    clientConfig = deepExtend({}, configBase, configBaseClient, clientConfig);
+    // ready
+    return clientConfig;
+  }
   prepareDbInfo(dbInfoOrClientName) {
     let level;
     let clientName;
@@ -262,14 +282,14 @@ let ServiceDatabase = (_dec$t = Service(), _dec2$t = BeanInfo({
     });
   }
   async reloadClients(clientName, clientConfig, extraData) {
-    await this.__reloadAllClientsRaw(clientName, clientConfig, extraData);
+    await this.reloadClientsRaw(clientName, clientConfig, extraData);
     this.scope.broadcast.databaseClientReload.emit({
       clientName,
       clientConfig,
       extraData
     });
   }
-  async __reloadAllClientsRaw(clientName, clientConfig, extraData) {
+  async reloadClientsRaw(clientName, clientConfig, extraData) {
     await this.scope.event.databaseClientReload.emit({
       clientName: this.prepareClientName(clientName),
       clientConfig,
@@ -277,12 +297,24 @@ let ServiceDatabase = (_dec$t = Service(), _dec2$t = BeanInfo({
     });
     this.__columnsClearRaw(clientName);
   }
-}) || _class$t) || _class$t);
+  async disposeClients(clientName) {
+    await this.disposeClientsRaw(clientName);
+    this.scope.broadcast.databaseClientDispose.emit({
+      clientName
+    });
+  }
+  async disposeClientsRaw(clientName) {
+    await this.scope.event.databaseClientDispose.emit({
+      clientName: this.prepareClientName(clientName)
+    });
+    this.__columnsClearRaw(clientName);
+  }
+}) || _class$v) || _class$v);
 
-var _dec$s, _dec2$s, _class$s;
-let ServiceTransactionConsistency‌ = (_dec$s = Service(), _dec2$s = BeanInfo({
+var _dec$u, _dec2$u, _class$u;
+let ServiceTransactionConsistency‌ = (_dec$u = Service(), _dec2$u = BeanInfo({
   module: "a-orm"
-}), _dec$s(_class$s = _dec2$s(_class$s = class ServiceTransactionConsistency‌ extends BeanBase {
+}), _dec$u(_class$u = _dec2$u(_class$u = class ServiceTransactionConsistency‌ extends BeanBase {
   constructor(...args) {
     super(...args);
     this._commitCallbacks = [];
@@ -310,12 +342,12 @@ let ServiceTransactionConsistency‌ = (_dec$s = Service(), _dec2$s = BeanInfo({
     }
     this._commitCallbacks = [];
   }
-}) || _class$s) || _class$s);
+}) || _class$u) || _class$u);
 
-var _dec$r, _dec2$r, _class$r;
-let ServiceTransactionFiber = (_dec$r = Service(), _dec2$r = BeanInfo({
+var _dec$t, _dec2$t, _class$t;
+let ServiceTransactionFiber = (_dec$t = Service(), _dec2$t = BeanInfo({
   module: "a-orm"
-}), _dec$r(_class$r = _dec2$r(_class$r = class ServiceTransactionFiber extends BeanBase {
+}), _dec$t(_class$t = _dec2$t(_class$t = class ServiceTransactionFiber extends BeanBase {
   constructor(...args) {
     super(...args);
     this._connection = void 0;
@@ -344,12 +376,12 @@ let ServiceTransactionFiber = (_dec$r = Service(), _dec2$r = BeanInfo({
     await this._transactionConsistency.compensatesDone();
     this._connection = undefined;
   }
-}) || _class$r) || _class$r);
+}) || _class$t) || _class$t);
 
-var _dec$q, _dec2$q, _class$q;
-let ServiceTransactionState = (_dec$q = Service(), _dec2$q = BeanInfo({
+var _dec$s, _dec2$s, _class$s;
+let ServiceTransactionState = (_dec$s = Service(), _dec2$s = BeanInfo({
   module: "a-orm"
-}), _dec$q(_class$q = _dec2$q(_class$q = class ServiceTransactionState extends BeanBase {
+}), _dec$s(_class$s = _dec2$s(_class$s = class ServiceTransactionState extends BeanBase {
   constructor(...args) {
     super(...args);
     this._fibers = {};
@@ -371,12 +403,12 @@ let ServiceTransactionState = (_dec$q = Service(), _dec2$q = BeanInfo({
     const selector = this.serviceDatabase.prepareClientNameSelector(dbInfo);
     delete this._fibers[selector];
   }
-}) || _class$q) || _class$q);
+}) || _class$s) || _class$s);
 
-var _dec$p, _dec2$p, _class$p;
-let ServiceTransactionAsyncLocalStorage = (_dec$p = Service(), _dec2$p = BeanInfo({
+var _dec$r, _dec2$r, _class$r;
+let ServiceTransactionAsyncLocalStorage = (_dec$r = Service(), _dec2$r = BeanInfo({
   module: "a-orm"
-}), _dec$p(_class$p = _dec2$p(_class$p = class ServiceTransactionAsyncLocalStorage extends BeanBase {
+}), _dec$r(_class$r = _dec2$r(_class$r = class ServiceTransactionAsyncLocalStorage extends BeanBase {
   constructor(...args) {
     super(...args);
     this.transactionStorage = void 0;
@@ -397,12 +429,12 @@ let ServiceTransactionAsyncLocalStorage = (_dec$p = Service(), _dec2$p = BeanInf
       return fn();
     });
   }
-}) || _class$p) || _class$p);
+}) || _class$r) || _class$r);
 
-var _dec$o, _dec2$o, _class$o;
-let ServiceTransaction = (_dec$o = Service(), _dec2$o = BeanInfo({
+var _dec$q, _dec2$q, _class$q;
+let ServiceTransaction = (_dec$q = Service(), _dec2$q = BeanInfo({
   module: "a-orm"
-}), _dec$o(_class$o = _dec2$o(_class$o = class ServiceTransaction extends BeanBase {
+}), _dec$q(_class$q = _dec2$q(_class$q = class ServiceTransaction extends BeanBase {
   constructor(...args) {
     super(...args);
     this._db = void 0;
@@ -521,7 +553,7 @@ let ServiceTransaction = (_dec$o = Service(), _dec2$o = BeanInfo({
     }
     return res;
   }
-}) || _class$o) || _class$o);
+}) || _class$q) || _class$q);
 function _translateTransactionOptions(options) {
   if (!options) return undefined;
   return {
@@ -530,10 +562,10 @@ function _translateTransactionOptions(options) {
   };
 }
 
-var _dec$n, _dec2$n, _class$n;
-let ServiceDb = (_dec$n = Service(), _dec2$n = BeanInfo({
+var _dec$p, _dec2$p, _class$p;
+let ServiceDb = (_dec$p = Service(), _dec2$p = BeanInfo({
   module: "a-orm"
-}), _dec$n(_class$n = _dec2$n(_class$n = class ServiceDb extends BeanBase {
+}), _dec$p(_class$p = _dec2$p(_class$p = class ServiceDb extends BeanBase {
   constructor(...args) {
     super(...args);
     this._client = void 0;
@@ -588,12 +620,12 @@ let ServiceDb = (_dec$n = Service(), _dec2$n = BeanInfo({
   compensate(cb) {
     return this.transaction.compensate(cb);
   }
-}) || _class$n) || _class$n);
+}) || _class$p) || _class$p);
 
-var _dec$m, _dec2$m, _class$m;
-let ServiceDatabaseClient = (_dec$m = Service(), _dec2$m = BeanInfo({
+var _dec$o, _dec2$o, _class$o;
+let ServiceDatabaseClient = (_dec$o = Service(), _dec2$o = BeanInfo({
   module: "a-orm"
-}), _dec$m(_class$m = _dec2$m(_class$m = class ServiceDatabaseClient extends BeanBase {
+}), _dec$o(_class$o = _dec2$o(_class$o = class ServiceDatabaseClient extends BeanBase {
   constructor(...args) {
     super(...args);
     this.level = void 0;
@@ -603,6 +635,7 @@ let ServiceDatabaseClient = (_dec$m = Service(), _dec2$m = BeanInfo({
     this._knex = void 0;
     this._db = void 0;
     this._onDatabaseClientReloadCancel = void 0;
+    this._onDatabaseClientDisposeCancel = void 0;
   }
   get configDatabase() {
     return this.app.config.database;
@@ -618,7 +651,7 @@ let ServiceDatabaseClient = (_dec$m = Service(), _dec2$m = BeanInfo({
     this._db = this.bean._newBean(ServiceDb, this);
     // load
     this.__load(clientNameSelector, clientConfig);
-    // event
+    // event: databaseClientReload
     this._onDatabaseClientReloadCancel = this.scope.event.databaseClientReload.on(async ({
       clientName,
       clientConfig
@@ -628,11 +661,23 @@ let ServiceDatabaseClient = (_dec$m = Service(), _dec2$m = BeanInfo({
       }
       await next();
     });
+    // event: databaseClientDispose
+    this._onDatabaseClientDisposeCancel = this.scope.event.databaseClientDispose.on(async ({
+      clientName
+    }, next) => {
+      if (clientName === this.clientName) {
+        await this.bean.disposeInstance(this.$beanInstanceKey);
+      }
+      await next();
+    });
   }
   async __dispose__() {
     this._db = undefined;
     await this.__close();
     this._onDatabaseClientReloadCancel?.();
+    this._onDatabaseClientDisposeCancel?.();
+    this._onDatabaseClientReloadCancel = undefined;
+    this._onDatabaseClientDisposeCancel = undefined;
   }
   __load(clientNameSelector, clientConfig) {
     // name
@@ -641,7 +686,7 @@ let ServiceDatabaseClient = (_dec$m = Service(), _dec2$m = BeanInfo({
     this.level = dbInfo.level;
     this.clientName = dbInfo.clientName;
     // config
-    this.clientConfig = clientConfig ? deepExtend({}, clientConfig) : this.getClientConfig(this.clientName);
+    this.clientConfig = clientConfig ? deepExtend({}, clientConfig) : this.scope.service.database.getClientConfig(this.clientName);
     this.$loggerChild('database').debug('clientName: %s, clientConfig: %j', this.clientName, this.clientConfig);
     // knex
     this._knex = knex(this.clientConfig);
@@ -656,23 +701,6 @@ let ServiceDatabaseClient = (_dec$m = Service(), _dec2$m = BeanInfo({
     await this.__close();
     this.__load(this.clientNameSelector, clientConfig);
   }
-  getClientConfig(clientName, original = false) {
-    // clientConfig
-    let clientConfig = this.configDatabase.clients[clientName];
-    if (original) return clientConfig;
-    // check
-    if (!clientConfig) {
-      throw new Error(`database config not found: ${clientName}`);
-    }
-    // configBaseClient
-    const dialect = this.scope.service.database.getDialect(clientConfig.client);
-    const configBaseClient = dialect.getConfigBase();
-    // combine
-    const configBase = this.configDatabase.base;
-    clientConfig = deepExtend({}, configBase, configBaseClient, clientConfig);
-    // ready
-    return clientConfig;
-  }
   getDatabaseName() {
     const connection = this.clientConfig.connection;
     return connection.database || connection.filename;
@@ -687,24 +715,27 @@ let ServiceDatabaseClient = (_dec$m = Service(), _dec2$m = BeanInfo({
     }
     return result;
   }
-  async changeConfigAndReload(databaseName) {
+
+  // only used by startup, so no consider that workers broadcast
+  async changeConfigConnectionAndReload(databaseName) {
     // set databaseName
     const connDatabaseName = this._prepareDatabaseName(databaseName);
     // set config
     //   * should not use this.clientConfig.connection, because password is hidden
-    const config = this.getClientConfig(this.clientName, true);
+    const config = this.scope.service.database.getClientConfig(this.clientName, true);
     config.connection = Object.assign({}, config.connection, connDatabaseName);
     // only used by startup, so no consider that workers broadcast
     this.configDatabase.clients[this.clientName] = config;
     // reload
-    await this.scope.service.database.reloadClients(this.clientName, config);
+    await this.scope.service.database.reloadClientsRaw(this.clientName, config);
+    // await this.scope.service.database.reloadClients(this.clientName, config);
   }
-}) || _class$m) || _class$m);
+}) || _class$o) || _class$o);
 
-var _dec$l, _dec2$l, _class$l;
-let BeanDatabase = (_dec$l = Bean(), _dec2$l = BeanInfo({
+var _dec$n, _dec2$n, _class$n;
+let BeanDatabase = (_dec$n = Bean(), _dec2$n = BeanInfo({
   module: "a-orm"
-}), _dec$l(_class$l = _dec2$l(_class$l = class BeanDatabase extends BeanBase {
+}), _dec$n(_class$n = _dec2$n(_class$n = class BeanDatabase extends BeanBase {
   get current() {
     return this.bean._getBean(ServiceDatabaseAsyncLocalStorage).current;
   }
@@ -734,12 +765,12 @@ let BeanDatabase = (_dec$l = Bean(), _dec2$l = BeanInfo({
       return this.bean._getBean(ServiceTransactionAsyncLocalStorage).run(fn);
     });
   }
-}) || _class$l) || _class$l);
+}) || _class$n) || _class$n);
 
-var _dec$k, _dec2$k, _dec3$7, _class$k;
-let BeanDatabaseDialectBase = (_dec$k = Bean(), _dec2$k = Virtual(), _dec3$7 = BeanInfo({
+var _dec$m, _dec2$m, _dec3$7, _class$m;
+let BeanDatabaseDialectBase = (_dec$m = Bean(), _dec2$m = Virtual(), _dec3$7 = BeanInfo({
   module: "a-orm"
-}), _dec$k(_class$k = _dec2$k(_class$k = _dec3$7(_class$k = class BeanDatabaseDialectBase extends BeanBase {
+}), _dec$m(_class$m = _dec2$m(_class$m = _dec3$7(_class$m = class BeanDatabaseDialectBase extends BeanBase {
   getConfigBase() {
     return undefined;
   }
@@ -799,7 +830,7 @@ let BeanDatabaseDialectBase = (_dec$k = Bean(), _dec2$k = Virtual(), _dec3$7 = B
   _columnTypePrefixes(type, prefixes) {
     return prefixes.some(prefix => type.includes(prefix));
   }
-}) || _class$k) || _class$k) || _class$k);
+}) || _class$m) || _class$m) || _class$m);
 
 const OpAggrs = ['count', 'sum', 'avg', 'max', 'min'];
 const OpJoint = {
@@ -1205,69 +1236,69 @@ function _initializerDefineProperty(e, i, r, l) {
   });
 }
 
-var _dec$j, _dec2$j, _dec3$6, _dec4$4, _dec5$1, _dec6$1, _dec7$1, _class$j, _descriptor$4, _descriptor2$2, _descriptor3$1;
+var _dec$l, _dec2$l, _dec3$6, _dec4$4, _dec5$1, _dec6$1, _dec7$1, _class$l, _descriptor$4, _descriptor2$2, _descriptor3$1;
 const app$1 = useApp();
 const ormConfig$1 = app$1.util.getModuleConfigRaw('a-orm');
 const ordersDefault = ormConfig$1?.rest?.query?.orders?.default ?? 'createdAt,desc';
-let DtoQueryBase = (_dec$j = Api.field(v.optional(), v.array(String, {
+let DtoQueryBase = (_dec$l = Api.field(v.optional(), v.array(String, {
   separator: ','
-})), _dec2$j = Reflect.metadata("design:type", Array), _dec3$6 = Api.field(v.optional(), z.looseObject({})), _dec4$4 = Reflect.metadata("design:type", Object), _dec5$1 = Api.field(v.default(ordersDefault), v.optional(), z.union([z.string(), z.array(z.array(z.string()))])), _dec6$1 = Api.field(v.optional(), z.union([z.string(), z.array(z.array(z.string()))])), _dec7$1 = Reflect.metadata("design:type", Object), _class$j = class DtoQueryBase {
+})), _dec2$l = Reflect.metadata("design:type", Array), _dec3$6 = Api.field(v.optional(), z.looseObject({})), _dec4$4 = Reflect.metadata("design:type", Object), _dec5$1 = Api.field(v.default(ordersDefault), v.optional(), z.union([z.string(), z.array(z.array(z.string()))])), _dec6$1 = Api.field(v.optional(), z.union([z.string(), z.array(z.array(z.string()))])), _dec7$1 = Reflect.metadata("design:type", Object), _class$l = class DtoQueryBase {
   constructor() {
     _initializerDefineProperty(this, "columns", _descriptor$4, this);
     _initializerDefineProperty(this, "where", _descriptor2$2, this);
     _initializerDefineProperty(this, "orders", _descriptor3$1, this);
   }
-}, _descriptor$4 = _applyDecoratedDescriptor(_class$j.prototype, "columns", [_dec$j, _dec2$j], {
+}, _descriptor$4 = _applyDecoratedDescriptor(_class$l.prototype, "columns", [_dec$l, _dec2$l], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2$2 = _applyDecoratedDescriptor(_class$j.prototype, "where", [_dec3$6, _dec4$4], {
+}), _descriptor2$2 = _applyDecoratedDescriptor(_class$l.prototype, "where", [_dec3$6, _dec4$4], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor3$1 = _applyDecoratedDescriptor(_class$j.prototype, "orders", [_dec5$1, _dec6$1, _dec7$1], {
+}), _descriptor3$1 = _applyDecoratedDescriptor(_class$l.prototype, "orders", [_dec5$1, _dec6$1, _dec7$1], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class$j);
+}), _class$l);
 
-var _dec$i, _dec2$i, _dec3$5, _dec4$3, _class$i, _descriptor$3, _descriptor2$1;
+var _dec$k, _dec2$k, _dec3$5, _dec4$3, _class$k, _descriptor$3, _descriptor2$1;
 const app = useApp();
 const ormConfig = app.util.getModuleConfigRaw('a-orm');
 const pageSizeDefault = ormConfig?.rest?.query?.pageSize?.default ?? 20;
 const pageSizeMax = ormConfig?.rest?.query?.pageSize?.max ?? 100;
-let DtoQueryPageBase = (_dec$i = Api.field(z.number().min(1).default(1)), _dec2$i = Reflect.metadata("design:type", Number), _dec3$5 = Api.field(z.number().min(1).max(pageSizeMax).default(pageSizeDefault)), _dec4$3 = Reflect.metadata("design:type", Number), _class$i = class DtoQueryPageBase extends DtoQueryBase {
+let DtoQueryPageBase = (_dec$k = Api.field(z.number().min(1).default(1)), _dec2$k = Reflect.metadata("design:type", Number), _dec3$5 = Api.field(z.number().min(1).max(pageSizeMax).default(pageSizeDefault)), _dec4$3 = Reflect.metadata("design:type", Number), _class$k = class DtoQueryPageBase extends DtoQueryBase {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "pageNo", _descriptor$3, this);
     _initializerDefineProperty(this, "pageSize", _descriptor2$1, this);
   }
-}, _descriptor$3 = _applyDecoratedDescriptor(_class$i.prototype, "pageNo", [_dec$i, _dec2$i], {
+}, _descriptor$3 = _applyDecoratedDescriptor(_class$k.prototype, "pageNo", [_dec$k, _dec2$k], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2$1 = _applyDecoratedDescriptor(_class$i.prototype, "pageSize", [_dec3$5, _dec4$3], {
+}), _descriptor2$1 = _applyDecoratedDescriptor(_class$k.prototype, "pageSize", [_dec3$5, _dec4$3], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class$i);
+}), _class$k);
 
 const SymbolKeyFieldsMore = Symbol('$fieldsMore');
 
 class EntityBaseEmpty {}
 
-var _dec$h, _dec2$h, _dec3$4, _dec4$2, _dec5, _dec6, _dec7, _dec8, _class$h, _descriptor$2, _descriptor2, _descriptor3, _descriptor4;
-let EntityBaseInner = (_dec$h = Api.field(v.openapi({
+var _dec$j, _dec2$j, _dec3$4, _dec4$2, _dec5, _dec6, _dec7, _dec8, _class$j, _descriptor$2, _descriptor2, _descriptor3, _descriptor4;
+let EntityBaseInner = (_dec$j = Api.field(v.openapi({
   title: $locale('CreatedAt'),
   rest: {
     order: OrderMaxBase - 2
   }
-})), _dec2$h = Reflect.metadata("design:type", typeof Date === "undefined" ? Object : Date), _dec3$4 = Api.field(v.openapi({
+})), _dec2$j = Reflect.metadata("design:type", typeof Date === "undefined" ? Object : Date), _dec3$4 = Api.field(v.openapi({
   title: $locale('UpdatedAt'),
   rest: {
     order: OrderMaxBase - 1
@@ -1282,7 +1313,7 @@ let EntityBaseInner = (_dec$h = Api.field(v.openapi({
   rest: {
     visible: false
   }
-}), v.default(0)), _dec8 = Reflect.metadata("design:type", Number), _class$h = class EntityBaseInner extends EntityBaseEmpty {
+}), v.default(0)), _dec8 = Reflect.metadata("design:type", Number), _class$j = class EntityBaseInner extends EntityBaseEmpty {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "createdAt", _descriptor$2, this);
@@ -1290,63 +1321,63 @@ let EntityBaseInner = (_dec$h = Api.field(v.openapi({
     _initializerDefineProperty(this, "deleted", _descriptor3, this);
     _initializerDefineProperty(this, "iid", _descriptor4, this);
   }
-}, _descriptor$2 = _applyDecoratedDescriptor(_class$h.prototype, "createdAt", [_dec$h, _dec2$h], {
+}, _descriptor$2 = _applyDecoratedDescriptor(_class$j.prototype, "createdAt", [_dec$j, _dec2$j], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2 = _applyDecoratedDescriptor(_class$h.prototype, "updatedAt", [_dec3$4, _dec4$2], {
+}), _descriptor2 = _applyDecoratedDescriptor(_class$j.prototype, "updatedAt", [_dec3$4, _dec4$2], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor3 = _applyDecoratedDescriptor(_class$h.prototype, "deleted", [_dec5, _dec6], {
+}), _descriptor3 = _applyDecoratedDescriptor(_class$j.prototype, "deleted", [_dec5, _dec6], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor4 = _applyDecoratedDescriptor(_class$h.prototype, "iid", [_dec7, _dec8], {
+}), _descriptor4 = _applyDecoratedDescriptor(_class$j.prototype, "iid", [_dec7, _dec8], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class$h);
+}), _class$j);
 
-var _dec$g, _dec2$g, _class$g, _descriptor$1;
-let EntityBase = (_dec$g = Api.field(v.openapi({
+var _dec$i, _dec2$i, _class$i, _descriptor$1;
+let EntityBase = (_dec$i = Api.field(v.openapi({
   title: $locale('TableIdentity'),
   rest: {
     order: OrderCoreBase + 1
   }
-}), v.tableIdentity()), _dec2$g = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _class$g = class EntityBase extends EntityBaseInner {
+}), v.tableIdentity()), _dec2$i = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _class$i = class EntityBase extends EntityBaseInner {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "id", _descriptor$1, this);
   }
-}, _descriptor$1 = _applyDecoratedDescriptor(_class$g.prototype, "id", [_dec$g, _dec2$g], {
+}, _descriptor$1 = _applyDecoratedDescriptor(_class$i.prototype, "id", [_dec$i, _dec2$i], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class$g);
+}), _class$i);
 
-var _dec$f, _dec2$f, _class$f, _descriptor;
-let EntityBaseSimple = (_dec$f = Api.field(v.openapi({
+var _dec$h, _dec2$h, _class$h, _descriptor;
+let EntityBaseSimple = (_dec$h = Api.field(v.openapi({
   title: $locale('TableIdentity'),
   rest: {
     order: OrderCoreBase + 1
   }
-})), _dec2$f = Reflect.metadata("design:type", Number), _class$f = class EntityBaseSimple extends EntityBaseInner {
+})), _dec2$h = Reflect.metadata("design:type", Number), _class$h = class EntityBaseSimple extends EntityBaseInner {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "id", _descriptor, this);
   }
-}, _descriptor = _applyDecoratedDescriptor(_class$f.prototype, "id", [_dec$f, _dec2$f], {
+}, _descriptor = _applyDecoratedDescriptor(_class$h.prototype, "id", [_dec$h, _dec2$h], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class$f);
+}), _class$h);
 
 const SymbolKeyEntity = Symbol('$entity');
 const SymbolKeyEntityMeta = Symbol('$entityMeta');
@@ -2139,10 +2170,10 @@ class BeanModelCrudTable extends BeanModelCrudInner {
   }
 }
 
-var _dec$e, _dec2$e, _dec3$3, _class$e;
-let BeanModel = (_dec$e = Bean(), _dec2$e = Virtual(), _dec3$3 = BeanInfo({
+var _dec$g, _dec2$g, _dec3$3, _class$g;
+let BeanModel = (_dec$g = Bean(), _dec2$g = Virtual(), _dec3$3 = BeanInfo({
   module: "a-orm"
-}), _dec$e(_class$e = _dec2$e(_class$e = _dec3$3(_class$e = class BeanModel extends BeanModelCrudTable {}) || _class$e) || _class$e) || _class$e);
+}), _dec$g(_class$g = _dec2$g(_class$g = _dec3$3(_class$g = class BeanModel extends BeanModelCrudTable {}) || _class$g) || _class$g) || _class$g);
 
 const SymbolCacheOptions = Symbol('SymbolCacheOptions');
 const SymbolCacheEnabled = Symbol('SymbolCacheEnabled');
@@ -2217,10 +2248,10 @@ class ModelCacheBase extends BeanBase {
   }
 }
 
-var _dec$d, _dec2$d, _class$d;
-let ServiceCacheEntity = (_dec$d = Service(), _dec2$d = BeanInfo({
+var _dec$f, _dec2$f, _class$f;
+let ServiceCacheEntity = (_dec$f = Service(), _dec2$f = BeanInfo({
   module: "a-orm"
-}), _dec$d(_class$d = _dec2$d(_class$d = class ServiceCacheEntity extends ModelCacheBase {
+}), _dec$f(_class$f = _dec2$f(_class$f = class ServiceCacheEntity extends ModelCacheBase {
   __init__(model) {
     super.__init__(model, 'entity');
   }
@@ -2243,12 +2274,12 @@ let ServiceCacheEntity = (_dec$d = Service(), _dec2$d = BeanInfo({
   get keysAux() {
     return this._model.options.cache?.keysAux;
   }
-}) || _class$d) || _class$d);
+}) || _class$f) || _class$f);
 
-var _dec$c, _dec2$c, _class$c;
-let ServiceCacheQuery = (_dec$c = Service(), _dec2$c = BeanInfo({
+var _dec$e, _dec2$e, _class$e;
+let ServiceCacheQuery = (_dec$e = Service(), _dec2$e = BeanInfo({
   module: "a-orm"
-}), _dec$c(_class$c = _dec2$c(_class$c = class ServiceCacheQuery extends ModelCacheBase {
+}), _dec$e(_class$e = _dec2$e(_class$e = class ServiceCacheQuery extends ModelCacheBase {
   __init__(model) {
     super.__init__(model, 'query');
   }
@@ -2258,7 +2289,7 @@ let ServiceCacheQuery = (_dec$c = Service(), _dec2$c = BeanInfo({
     const cache = this.getInstance(table);
     await cache.clear();
   }
-}) || _class$c) || _class$c);
+}) || _class$e) || _class$e);
 
 function handleRelationsCollection(relationsStatic, includeWrapper) {
   // collect
@@ -2303,10 +2334,10 @@ function handleRelationsCollection(relationsStatic, includeWrapper) {
   return relations;
 }
 
-var _dec$b, _dec2$b, _class$b;
-let ServiceRelations = (_dec$b = Service(), _dec2$b = BeanInfo({
+var _dec$d, _dec2$d, _class$d;
+let ServiceRelations = (_dec$d = Service(), _dec2$d = BeanInfo({
   module: "a-orm"
-}), _dec$b(_class$b = _dec2$b(_class$b = class ServiceRelations extends BeanBase {
+}), _dec$d(_class$d = _dec2$d(_class$d = class ServiceRelations extends BeanBase {
   constructor(...args) {
     super(...args);
     this._model = void 0;
@@ -2838,7 +2869,7 @@ let ServiceRelations = (_dec$b = Service(), _dec2$b = BeanInfo({
   handleRelationsCollection(includeWrapper) {
     return handleRelationsCollection(this._model.options.relations, includeWrapper);
   }
-}) || _class$b) || _class$b);
+}) || _class$d) || _class$d);
 
 class BeanModelCrud extends BeanModelCrudInner {
   async mget(ids, options) {
@@ -3499,16 +3530,16 @@ class BeanModelCache extends BeanModelCrud {
   }
 }
 
-var _dec$a, _dec2$a, _dec3$2, _class$a;
-let BeanModelBase = (_dec$a = Bean(), _dec2$a = Virtual(), _dec3$2 = BeanInfo({
+var _dec$c, _dec2$c, _dec3$2, _class$c;
+let BeanModelBase = (_dec$c = Bean(), _dec2$c = Virtual(), _dec3$2 = BeanInfo({
   module: "a-orm"
-}), _dec$a(_class$a = _dec2$a(_class$a = _dec3$2(_class$a = class BeanModelBase extends BeanModelCache {}) || _class$a) || _class$a) || _class$a);
+}), _dec$c(_class$c = _dec2$c(_class$c = _dec3$2(_class$c = class BeanModelBase extends BeanModelCache {}) || _class$c) || _class$c) || _class$c);
 
-var _dec$9, _dec2$9, _dec3$1, _dec4$1, _class$9;
+var _dec$b, _dec2$b, _dec3$1, _dec4$1, _class$b;
 const SymbolModuleScope$1 = Symbol('SymbolModuleScope');
-let ServiceEntityResolver = (_dec$9 = Service(), _dec2$9 = BeanInfo({
+let ServiceEntityResolver = (_dec$b = Service(), _dec2$b = BeanInfo({
   module: "a-orm"
-}), _dec3$1 = Reflect.metadata("design:type", Function), _dec4$1 = Reflect.metadata("design:paramtypes", [String]), _dec$9(_class$9 = _dec2$9(_class$9 = _dec3$1(_class$9 = _dec4$1(_class$9 = class ServiceEntityResolver extends BeanBase {
+}), _dec3$1 = Reflect.metadata("design:type", Function), _dec4$1 = Reflect.metadata("design:paramtypes", [String]), _dec$b(_class$b = _dec2$b(_class$b = _dec3$1(_class$b = _dec4$1(_class$b = class ServiceEntityResolver extends BeanBase {
   constructor(moduleScope) {
     super();
     this[SymbolModuleScope$1] = void 0;
@@ -3523,13 +3554,13 @@ let ServiceEntityResolver = (_dec$9 = Service(), _dec2$9 = BeanInfo({
     }
     return this.__instances[prop];
   }
-}) || _class$9) || _class$9) || _class$9) || _class$9);
+}) || _class$b) || _class$b) || _class$b) || _class$b);
 
-var _dec$8, _dec2$8, _dec3, _dec4, _class$8;
+var _dec$a, _dec2$a, _dec3, _dec4, _class$a;
 const SymbolModuleScope = Symbol('SymbolModuleScope');
-let ServiceModelResolver = (_dec$8 = Service(), _dec2$8 = BeanInfo({
+let ServiceModelResolver = (_dec$a = Service(), _dec2$a = BeanInfo({
   module: "a-orm"
-}), _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [String]), _dec$8(_class$8 = _dec2$8(_class$8 = _dec3(_class$8 = _dec4(_class$8 = class ServiceModelResolver extends BeanBase {
+}), _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [String]), _dec$a(_class$a = _dec2$a(_class$a = _dec3(_class$a = _dec4(_class$a = class ServiceModelResolver extends BeanBase {
   constructor(moduleScope) {
     super();
     this[SymbolModuleScope] = void 0;
@@ -3539,12 +3570,12 @@ let ServiceModelResolver = (_dec$8 = Service(), _dec2$8 = BeanInfo({
     const beanFullName = `${this[SymbolModuleScope]}.model.${prop}`;
     return this.bean._getBean(beanFullName);
   }
-}) || _class$8) || _class$8) || _class$8) || _class$8);
+}) || _class$a) || _class$a) || _class$a) || _class$a);
 
-var _dec$7, _dec2$7, _class$7;
-let BroadcastColumnsClear = (_dec$7 = Broadcast(), _dec2$7 = BeanInfo({
+var _dec$9, _dec2$9, _class$9;
+let BroadcastColumnsClear = (_dec$9 = Broadcast(), _dec2$9 = BeanInfo({
   module: "a-orm"
-}), _dec$7(_class$7 = _dec2$7(_class$7 = class BroadcastColumnsClear extends BeanBroadcastBase {
+}), _dec$9(_class$9 = _dec2$9(_class$9 = class BroadcastColumnsClear extends BeanBroadcastBase {
   async execute(data, isEmitter) {
     const {
       clientName,
@@ -3554,12 +3585,26 @@ let BroadcastColumnsClear = (_dec$7 = Broadcast(), _dec2$7 = BeanInfo({
       await cast(this.scope.service.database).__columnsClearRaw(clientName, tableName);
     }
   }
-}) || _class$7) || _class$7);
+}) || _class$9) || _class$9);
 
-var _dec$6, _dec2$6, _class$6;
-let BroadcastDatabaseClientReload = (_dec$6 = Broadcast(), _dec2$6 = BeanInfo({
+var _dec$8, _dec2$8, _class$8;
+let BroadcastDatabaseClientDispose = (_dec$8 = Broadcast(), _dec2$8 = BeanInfo({
   module: "a-orm"
-}), _dec$6(_class$6 = _dec2$6(_class$6 = class BroadcastDatabaseClientReload extends BeanBroadcastBase {
+}), _dec$8(_class$8 = _dec2$8(_class$8 = class BroadcastDatabaseClientDispose extends BeanBroadcastBase {
+  async execute(data, isEmitter) {
+    const {
+      clientName
+    } = data;
+    if (!isEmitter) {
+      await cast(this.scope.service.database).disposeClientsRaw(clientName);
+    }
+  }
+}) || _class$8) || _class$8);
+
+var _dec$7, _dec2$7, _class$7;
+let BroadcastDatabaseClientReload = (_dec$7 = Broadcast(), _dec2$7 = BeanInfo({
+  module: "a-orm"
+}), _dec$7(_class$7 = _dec2$7(_class$7 = class BroadcastDatabaseClientReload extends BeanBroadcastBase {
   async execute(data, isEmitter) {
     const {
       clientName,
@@ -3567,20 +3612,25 @@ let BroadcastDatabaseClientReload = (_dec$6 = Broadcast(), _dec2$6 = BeanInfo({
       extraData
     } = data;
     if (!isEmitter) {
-      await cast(this.scope.service.database).__reloadAllClientsRaw(clientName, clientConfig, extraData);
+      await cast(this.scope.service.database).reloadClientsRaw(clientName, clientConfig, extraData);
     }
   }
-}) || _class$6) || _class$6);
+}) || _class$7) || _class$7);
+
+var _dec$6, _dec2$6, _class$6;
+let EventClientNameReal = (_dec$6 = Event(), _dec2$6 = BeanInfo({
+  module: "a-orm"
+}), _dec$6(_class$6 = _dec2$6(_class$6 = class EventClientNameReal extends BeanEventBase {}) || _class$6) || _class$6);
 
 var _dec$5, _dec2$5, _class$5;
-let EventClientNameReal = (_dec$5 = Event(), _dec2$5 = BeanInfo({
+let EventColumnsClear = (_dec$5 = Event(), _dec2$5 = BeanInfo({
   module: "a-orm"
-}), _dec$5(_class$5 = _dec2$5(_class$5 = class EventClientNameReal extends BeanEventBase {}) || _class$5) || _class$5);
+}), _dec$5(_class$5 = _dec2$5(_class$5 = class EventColumnsClear extends BeanEventBase {}) || _class$5) || _class$5);
 
 var _dec$4, _dec2$4, _class$4;
-let EventColumnsClear = (_dec$4 = Event(), _dec2$4 = BeanInfo({
+let EventDatabaseClientDispose = (_dec$4 = Event(), _dec2$4 = BeanInfo({
   module: "a-orm"
-}), _dec$4(_class$4 = _dec2$4(_class$4 = class EventColumnsClear extends BeanEventBase {}) || _class$4) || _class$4);
+}), _dec$4(_class$4 = _dec2$4(_class$4 = class EventDatabaseClientDispose extends BeanEventBase {}) || _class$4) || _class$4);
 
 var _dec$3, _dec2$3, _class$3;
 let EventDatabaseClientReload = (_dec$3 = Event(), _dec2$3 = BeanInfo({
@@ -4344,4 +4394,4 @@ const $relationMutate = {
   belongsToMany
 };
 
-export { $Dto, $column, $columns, $columnsAll, $locale, $relation, $relationDynamic, $relationMutate, $tableColumns, $tableComments, $tableDefaults, $tableName, AopMethodTransaction, BeanDatabase, BeanDatabaseDialectBase, BeanModel, BeanModelBase, BeanModelMeta, BroadcastColumnsClear, BroadcastDatabaseClientReload, Database, DatabaseDialect, DtoQueryBase, DtoQueryPageBase, Entity, EntityBase, EntityBaseEmpty, EntityBaseInner, EntityBaseSimple, Errors, EventClientNameReal, EventColumnsClear, EventDatabaseClientReload, ExtendKnex, ExtendSchemaBuilder, ExtendTableBuilder, Main, Model, Op, OpAggrs, OpJoint, OpJointValues, OpNormal, OpNormalValues, OpValues, QueueDoubleDelete, ScheduleSoftDeletionPrune, ScopeModuleAOrm, ServiceCacheEntity, ServiceCacheQuery, ServiceColumns, ServiceColumnsCache, ServiceDatabase, ServiceDatabaseAsyncLocalStorage, ServiceDatabaseClient, ServiceDb, ServiceEntityResolver, ServiceModelResolver, ServiceRelations, ServiceTransaction, ServiceTransactionAsyncLocalStorage, ServiceTransactionConsistency‌, ServiceTransactionFiber, ServiceTransactionState, SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyFieldsMore, SymbolKeyModelOptions, TransactionIsolationLevelsMap, buildWhere, config, configDefault, getClassEntityFromClassModel, getTableOrTableAlias, getTargetColumnName, isAggrColumn, isRaw, isRef, locales, prepareClassModel, prepareColumns };
+export { $Dto, $column, $columns, $columnsAll, $locale, $relation, $relationDynamic, $relationMutate, $tableColumns, $tableComments, $tableDefaults, $tableName, AopMethodTransaction, BeanDatabase, BeanDatabaseDialectBase, BeanModel, BeanModelBase, BeanModelMeta, BroadcastColumnsClear, BroadcastDatabaseClientDispose, BroadcastDatabaseClientReload, Database, DatabaseDialect, DtoQueryBase, DtoQueryPageBase, Entity, EntityBase, EntityBaseEmpty, EntityBaseInner, EntityBaseSimple, Errors, EventClientNameReal, EventColumnsClear, EventDatabaseClientDispose, EventDatabaseClientReload, ExtendKnex, ExtendSchemaBuilder, ExtendTableBuilder, Main, Model, Op, OpAggrs, OpJoint, OpJointValues, OpNormal, OpNormalValues, OpValues, QueueDoubleDelete, ScheduleSoftDeletionPrune, ScopeModuleAOrm, ServiceCacheEntity, ServiceCacheQuery, ServiceColumns, ServiceColumnsCache, ServiceDatabase, ServiceDatabaseAsyncLocalStorage, ServiceDatabaseClient, ServiceDb, ServiceEntityResolver, ServiceModelResolver, ServiceRelations, ServiceTransaction, ServiceTransactionAsyncLocalStorage, ServiceTransactionConsistency‌, ServiceTransactionFiber, ServiceTransactionState, SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyFieldsMore, SymbolKeyModelOptions, TransactionIsolationLevelsMap, buildWhere, config, configDefault, getClassEntityFromClassModel, getTableOrTableAlias, getTargetColumnName, isAggrColumn, isRaw, isRef, locales, prepareClassModel, prepareColumns };

package/dist/service/database.d.ts

@@ -3,7 +3,9 @@ import type { ConfigDatabaseClient } from '../types/config.ts';
 import type { IDatabaseClientDialectRecord, IDatabaseClientRecord, IDbInfo } from '../types/database.ts';
 import { BeanBase } from 'vona';
 export declare class ServiceDatabase extends BeanBase {
+    get configDatabase(): import("../types/config.ts").ConfigDatabase;
     getDialect(client: keyof IDatabaseClientDialectRecord): BeanDatabaseDialectBase;
+    getClientConfig(clientName: keyof IDatabaseClientRecord, original?: boolean): ConfigDatabaseClient;
     prepareDbInfo(dbInfoOrClientName?: Partial<IDbInfo> | keyof IDatabaseClientRecord): IDbInfo;
     prepareClientNameSelector(dbInfo: IDbInfo): string;
     parseClientNameSelector(clientNameSelector: string): IDbInfo;
@@ -13,5 +15,7 @@ export declare class ServiceDatabase extends BeanBase {
     columnsClear(clientName?: keyof IDatabaseClientRecord, tableName?: string): void;
     private __columnsClearRaw;
     reloadClients(clientName?: keyof IDatabaseClientRecord, clientConfig?: ConfigDatabaseClient, extraData?: any): Promise<void>;
-    private __reloadAllClientsRaw;
+    reloadClientsRaw(clientName?: keyof IDatabaseClientRecord, clientConfig?: ConfigDatabaseClient, extraData?: any): Promise<void>;
+    disposeClients(clientName?: keyof IDatabaseClientRecord): Promise<void>;
+    disposeClientsRaw(clientName?: keyof IDatabaseClientRecord): Promise<void>;
 }

package/dist/service/databaseClient_.d.ts

@@ -15,6 +15,7 @@ export declare class ServiceDatabaseClient extends BeanBase {
     private _knex;
     private _db;
     private _onDatabaseClientReloadCancel?;
+    private _onDatabaseClientDisposeCancel?;
     get configDatabase(): import("../types/config.ts").ConfigDatabase;
     get connection(): Knex;
     get db(): ServiceDb;
@@ -23,8 +24,7 @@ export declare class ServiceDatabaseClient extends BeanBase {
     private __load;
     private __close;
     reload(clientConfig?: ConfigDatabaseClient): Promise<void>;
-    getClientConfig(clientName: keyof IDatabaseClientRecord, original?: boolean): ConfigDatabaseClient;
     getDatabaseName(): string;
     private _prepareDatabaseName;
-    changeConfigAndReload(databaseName: string): Promise<void>;
+    changeConfigConnectionAndReload(databaseName: string): Promise<void>;
 }

package/package.json

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