@nocobase/database 0.19.0-alpha.2 → 0.19.0-alpha.4

package/lib/database.js

@@ -590,14 +590,16 @@ const _Database = class _Database extends import_events.EventEmitter {
     const authenticate = /* @__PURE__ */ __name(async () => {
       try {
         await this.sequelize.authenticate(others);
-        this.logger.info("Connection has been established successfully.", { method: "auth" });
+        this.logger.info("connection has been established successfully.", { method: "auth" });
       } catch (error) {
-        this.logger.warn(`Attempt ${attemptNumber}/${retry}: Unable to connect to the database: ${error.message}`, {
+        this.logger.warn(`attempt ${attemptNumber}/${retry}: Unable to connect to the database: ${error.message}`, {
           method: "auth"
         });
         const nextDelay = startingDelay * Math.pow(timeMultiple, attemptNumber - 1);
-        this.logger.warn(`Will retry in ${nextDelay}ms...`, { method: "auth" });
         attemptNumber++;
+        if (attemptNumber < retry) {
+          this.logger.warn(`will retry in ${nextDelay}ms...`, { method: "auth" });
+        }
         throw error;
       }
     }, "authenticate");
@@ -702,20 +704,30 @@ const _Database = class _Database extends import_events.EventEmitter {
         return;
       },
       async onDump(dumper, collection) {
-        const viewDef = await collection.db.queryInterface.viewDef(collection.getTableNameWithSchemaAsString());
-        dumper.writeSQLContent(`view-${collection.name}`, {
-          sql: [
-            `DROP VIEW IF EXISTS ${collection.getTableNameWithSchemaAsString()}`,
-            `CREATE VIEW ${collection.getTableNameWithSchemaAsString()} AS ${viewDef}`
-          ],
-          group: "required"
-        });
+        try {
+          const viewDef = await collection.db.queryInterface.viewDef(collection.getTableNameWithSchemaAsString());
+          dumper.writeSQLContent(`view-${collection.name}`, {
+            sql: [
+              `DROP VIEW IF EXISTS ${collection.getTableNameWithSchemaAsString()}`,
+              `CREATE VIEW ${collection.getTableNameWithSchemaAsString()} AS ${viewDef}`
+            ],
+            group: "required"
+          });
+        } catch (e) {
+          return;
+        }
         return;
       }
     });
     this.collectionFactory.registerCollectionType(import_sql_collection.SqlCollection, {
       condition: (options) => {
         return options.sql;
+      },
+      async onSync() {
+        return;
+      },
+      async onDump(dumper, collection) {
+        return;
       }
     });
   }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.19.0-alpha.2",
+  "version": "0.19.0-alpha.4",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.19.0-alpha.2",
-    "@nocobase/utils": "0.19.0-alpha.2",
+    "@nocobase/logger": "0.19.0-alpha.4",
+    "@nocobase/utils": "0.19.0-alpha.4",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -35,5 +35,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "cff5b77ecf12ccdb450d50d505b3aa44a68478c8"
+  "gitHead": "9583023f7bea828da5192384a5c002782c341b65"
 }