vona-module-a-version 5.0.43 → 5.0.44

package/dist/index.js

@@ -131,9 +131,9 @@ let ServiceDatabase = (_dec$7 = Service(), _dec2$7 = BeanInfo({
   get configDatabase() {
     return this.app.config.database;
   }
-  getDatabasePrefix(configInstanceBase) {
-    const instanceName = configInstanceBase?.isolate ? `isolate${__separator}${configInstanceBase.name}` : 'share';
-    return `vona${__separator}test${__separator}${this.app.name}${__separator}${instanceName}${__separator}`;
+  getDatabasePrefix(instanceName, configInstanceBase) {
+    const prefix = configInstanceBase?.isolate ? `isolate${__separator}${instanceName}` : 'share';
+    return `vona${__separator}test${__separator}${this.app.name}${__separator}${prefix}${__separator}`;
   }
   async databaseInitStartup() {
     // database
@@ -143,13 +143,13 @@ let ServiceDatabase = (_dec$7 = Service(), _dec2$7 = BeanInfo({
     // database
     await this.__prepareDatabases(false);
   }
-  async prepareDatabase(clientName, versionStart, configInstanceBase) {
+  async prepareDatabase(clientName, versionStart, instanceName, configInstanceBase) {
     await this.bean.database.switchDb(async () => {
-      await this.__prepareDatabase(versionStart, configInstanceBase);
+      await this.__prepareDatabase(versionStart, instanceName, configInstanceBase);
     }, clientName);
   }
-  async __fetchDatabases(client, configInstanceBase) {
-    const databasePrefix = this.getDatabasePrefix(configInstanceBase);
+  async __fetchDatabases(client, instanceName, configInstanceBase) {
+    const databasePrefix = this.getDatabasePrefix(instanceName, configInstanceBase);
     // dbs
     let dbs = await client.connection.schema.fetchDatabases(databasePrefix);
     // filter
@@ -160,8 +160,8 @@ let ServiceDatabase = (_dec$7 = Service(), _dec2$7 = BeanInfo({
     // ok
     return dbs;
   }
-  async __createDatabase(client, configInstanceBase) {
-    const databasePrefix = this.getDatabasePrefix(configInstanceBase);
+  async __createDatabase(client, instanceName, configInstanceBase) {
+    const databasePrefix = this.getDatabasePrefix(instanceName, configInstanceBase);
     // create
     const databaseName = `${databasePrefix}${moment().format(__timeFormat)}`;
     await client.connection.schema.createDatabase(databaseName);
@@ -171,24 +171,27 @@ let ServiceDatabase = (_dec$7 = Service(), _dec2$7 = BeanInfo({
     // default
     await this.prepareDatabase('default', versionStart);
     // isolate
-    for (const configInstanceBase of this.app.config.instances) {
+    for (const key in this.app.config.instance.instances) {
+      const instanceName = key;
+      const configInstanceBase = this.app.config.instance.instances[instanceName];
+      if (configInstanceBase === false) continue;
       if (!configInstanceBase.isolate) continue;
-      if (!configInstanceBase.isolateClient) throw new Error(`should specify isolateClient for isolate instance: ${configInstanceBase.name}`);
-      await this.prepareDatabase(configInstanceBase.isolateClient, versionStart, configInstanceBase);
+      if (!configInstanceBase.isolateClient) throw new Error(`should specify isolateClient for isolate instance: ${instanceName}`);
+      await this.prepareDatabase(configInstanceBase.isolateClient, versionStart, instanceName, configInstanceBase);
     }
   }
-  async __prepareDatabase(versionStart, configInstanceBase) {
-    await this.__prepareDatabaseInner(configInstanceBase);
+  async __prepareDatabase(versionStart, instanceName, configInstanceBase) {
+    await this.__prepareDatabaseInner(instanceName, configInstanceBase);
     if (versionStart) {
       await this.scope.service.version.__start();
     }
   }
-  async __prepareDatabaseInner(configInstanceBase) {
+  async __prepareDatabaseInner(instanceName, configInstanceBase) {
     if (this.app.meta.isProd) {
       // donothing
       return;
     }
-    const databasePrefix = this.getDatabasePrefix(configInstanceBase);
+    const databasePrefix = this.getDatabasePrefix(instanceName, configInstanceBase);
     // client
     const client = this.bean.database.current.client;
     // get current database name
@@ -203,9 +206,9 @@ let ServiceDatabase = (_dec$7 = Service(), _dec2$7 = BeanInfo({
         // donothing
         return;
       }
-      const dbs = await this.__fetchDatabases(client, configInstanceBase);
+      const dbs = await this.__fetchDatabases(client, instanceName, configInstanceBase);
       if (dbs.length === 0) {
-        databaseName = await this.__createDatabase(client, configInstanceBase);
+        databaseName = await this.__createDatabase(client, instanceName, configInstanceBase);
       } else {
         databaseName = dbs[0].name;
       }
@@ -222,12 +225,12 @@ let ServiceDatabase = (_dec$7 = Service(), _dec2$7 = BeanInfo({
         return;
       }
       // drop old databases
-      const dbs = await this.__fetchDatabases(client, configInstanceBase);
+      const dbs = await this.__fetchDatabases(client, instanceName, configInstanceBase);
       for (const db of dbs) {
         await client.connection.schema.dropDatabase(db.name);
       }
       // create database
-      const databaseName = await this.__createDatabase(client, configInstanceBase);
+      const databaseName = await this.__createDatabase(client, instanceName, configInstanceBase);
       // set config and reload client
       await client.changeConfigConnectionAndReloadWorker(databaseName);
       // database ready

package/dist/service/database.d.ts

@@ -1,12 +1,13 @@
+import type { IInstanceRecord } from 'vona';
 import type { ConfigInstanceBase } from 'vona-module-a-instance';
 import type { IDatabaseClientRecord } from 'vona-module-a-orm';
 import { BeanBase } from 'vona';
 export declare class ServiceDatabase extends BeanBase {
     get configDatabase(): import("vona-module-a-orm").ConfigDatabase;
-    getDatabasePrefix(configInstanceBase?: ConfigInstanceBase): string;
+    getDatabasePrefix(instanceName?: keyof IInstanceRecord, configInstanceBase?: ConfigInstanceBase): string;
     databaseInitStartup(): Promise<void>;
     databaseNameStartup(): Promise<void>;
-    prepareDatabase(clientName: keyof IDatabaseClientRecord, versionStart: boolean, configInstanceBase?: ConfigInstanceBase): Promise<void>;
+    prepareDatabase(clientName: keyof IDatabaseClientRecord, versionStart: boolean, instanceName?: keyof IInstanceRecord, configInstanceBase?: ConfigInstanceBase): Promise<void>;
     private __fetchDatabases;
     private __createDatabase;
     private __prepareDatabases;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-version",
   "type": "module",
-  "version": "5.0.43",
+  "version": "5.0.44",
   "vonaModule": {
     "fileVersion": 1,
     "dependencies": {},