@nocobase/database 1.9.2 → 1.9.4

package/lib/collection.d.ts

@@ -124,6 +124,7 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     updateOptions(options: CollectionOptions, mergeOptions?: any): this;
     setSortable(sortable: any): void;
     updateField(name: string, options: FieldOptions): void;
+    private normalizeFieldName;
     addIndex(index: string | string[] | {
         fields: string[];
         unique?: boolean;

package/lib/collection.js

@@ -591,6 +591,12 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     }
     this.setField(options.name || name, options);
   }
+  normalizeFieldName(val) {
+    if (!this.options.underscored) {
+      return val;
+    }
+    return Array.isArray(val) ? val.map((v) => (0, import_utils.snakeCase)(v)) : (0, import_utils.snakeCase)(val);
+  }
   addIndex(index) {
     if (!index) {
       return;
@@ -620,7 +626,7 @@ const _Collection = class _Collection extends import_events.EventEmitter {
       return;
     }
     for (const item of indexes) {
-      if (import_lodash.default.isEqual(item.fields, indexName)) {
+      if (import_lodash.default.isEqual(this.normalizeFieldName(item.fields), this.normalizeFieldName(indexName))) {
         return;
       }
       const name2 = item.fields.join(",");
@@ -656,11 +662,21 @@ const _Collection = class _Collection extends import_events.EventEmitter {
    */
   refreshIndexes() {
     const indexes = this.model._indexes;
+    const attributes = {};
+    for (const [name, field] of Object.entries(this.model.getAttributes())) {
+      attributes[this.normalizeFieldName(name)] = field;
+    }
     this.model._indexes = import_lodash.default.uniqBy(
       indexes.filter((item) => {
-        return item.fields.every((field) => this.model.rawAttributes[field]);
+        return item.fields.every((field) => {
+          const name = this.normalizeFieldName(field);
+          return attributes[name];
+        });
       }).map((item) => {
-        item.fields = item.fields.map((field) => this.model.rawAttributes[field].field);
+        item.fields = item.fields.map((field) => {
+          const name = this.normalizeFieldName(field);
+          return attributes[name].field;
+        });
         return item;
       }),
       "name"

package/lib/dialects/mariadb-dialect.js

@@ -35,7 +35,12 @@ module.exports = __toCommonJS(mariadb_dialect_exports);
 var import_base_dialect = require("./base-dialect");
 const _MariadbDialect = class _MariadbDialect extends import_base_dialect.BaseDialect {
   getSequelizeOptions(options) {
-    options.dialectOptions = { ...options.dialectOptions || {}, supportBigNumbers: true, bigNumberStrings: true };
+    options.dialectOptions = {
+      ...options.dialectOptions || {},
+      multipleStatements: true,
+      supportBigNumbers: true,
+      bigNumberStrings: true
+    };
     return options;
   }
   getVersionGuard() {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.9.2",
+  "version": "1.9.4",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.9.2",
-    "@nocobase/utils": "1.9.2",
+    "@nocobase/logger": "1.9.4",
+    "@nocobase/utils": "1.9.4",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -39,5 +39,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "2a511560ce123d02a20b2a7757133e25ac664614"
+  "gitHead": "7431e8b3b3b9e06c21b05dc0af68349f7cfbe04f"
 }