@nocobase/database 1.0.0-alpha.15 → 1.0.0-alpha.16

package/lib/collection.d.ts

@@ -62,6 +62,7 @@ export interface CollectionOptions extends Omit<ModelOptions, 'name' | 'hooks'>
      * - 'user' - collection is from user
      */
     origin?: string;
+    asStrategyResource?: boolean;
     [key: string]: any;
 }
 export interface CollectionContext {

package/lib/collection.js

@@ -530,13 +530,9 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     const indexes = this.model._indexes;
     this.model._indexes = import_lodash.default.uniqBy(
       indexes.filter((item) => {
-        return item.fields.every(
-          (field) => Object.values(this.model.rawAttributes).find((fieldVal) => fieldVal.field === field)
-        );
+        return item.fields.every((field) => this.model.rawAttributes[field]);
       }).map((item) => {
-        if (this.options.underscored) {
-          item.fields = item.fields.map((field) => (0, import_utils.snakeCase)(field));
-        }
+        item.fields = item.fields.map((field) => this.model.rawAttributes[field].field);
         return item;
       }),
       "name"

package/lib/database.js

@@ -616,7 +616,7 @@ const _Database = class _Database extends import_events.EventEmitter {
   }
   /* istanbul ignore next -- @preserve */
   async auth(options = {}) {
-    const { retry = 10, ...others } = options;
+    const { retry = 5, ...others } = options;
     const startingDelay = 50;
     const timeMultiple = 2;
     let attemptNumber = 1;
@@ -643,7 +643,7 @@ const _Database = class _Database extends import_events.EventEmitter {
         timeMultiple
       });
     } catch (error) {
-      throw new Error("Connection failed, please check your database connection credentials and try again.");
+      throw new Error(`Unable to connect to the database`, { cause: error });
     }
   }
   /**

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.0.0-alpha.15",
+  "version": "1.0.0-alpha.16",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.0.0-alpha.15",
-    "@nocobase/utils": "1.0.0-alpha.15",
+    "@nocobase/logger": "1.0.0-alpha.16",
+    "@nocobase/utils": "1.0.0-alpha.16",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "2793d371368e094ea2bba04cfbe9b9b73c44edba"
+  "gitHead": "2a80f1804e0f0972d40e1a201310b192914849d0"
 }