@nocobase/database 1.9.0-beta.16 → 1.9.0-beta.18

package/lib/belongs-to-array/belongs-to-array-repository.d.ts

@@ -12,7 +12,6 @@ import { FindOptions } from '../repository';
 import { MultipleRelationRepository } from '../relation-repository/multiple-relation-repository';
 import Database from '../database';
 import { Model } from '../model';
-import { UpdateAssociationOptions } from '../update-associations';
 export declare class BelongsToArrayAssociation {
     db: Database;
     associationType: string;
@@ -35,7 +34,6 @@ export declare class BelongsToArrayAssociation {
     generateInclude(parentAs?: string): {
         on: void;
     };
-    update(instance: Model, value: any, options?: UpdateAssociationOptions): Promise<void>;
 }
 export declare class BelongsToArrayRepository extends MultipleRelationRepository {
     private belongsToArrayAssociation;

package/lib/belongs-to-array/belongs-to-array-repository.js

@@ -94,19 +94,6 @@ const _BelongsToArrayAssociation = class _BelongsToArrayAssociation {
       on: this.db.queryInterface.generateJoinOnForJSONArray(left, right)
     };
   }
-  async update(instance, value, options = {}) {
-    await instance.update(
-      {
-        [this.as]: value
-      },
-      {
-        values: {
-          [this.as]: value
-        },
-        transaction: options == null ? void 0 : options.transaction
-      }
-    );
-  }
 };
 __name(_BelongsToArrayAssociation, "BelongsToArrayAssociation");
 let BelongsToArrayAssociation = _BelongsToArrayAssociation;

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/lib/interfaces/time-interface.js

@@ -47,7 +47,7 @@ import_dayjs.default.extend(import_utc.default);
 const _TimeInterface = class _TimeInterface extends import_base_interface.BaseInterface {
   toValue(value, ctx) {
     if (this.validate(value)) {
-      const result = import_dayjs.default.utc(value).format("HH:mm:ss");
+      const result = (0, import_dayjs.default)(value).format("HH:mm:ss");
       return result;
     }
     return value;

package/lib/relation-repository/single-relation-repository.js

@@ -51,7 +51,6 @@ module.exports = __toCommonJS(single_relation_repository_exports);
 var import_target_collection_decorator = __toESM(require("../decorators/target-collection-decorator"));
 var import_update_associations = require("../update-associations");
 var import_relation_repository = require("./relation-repository");
-var import_lodash = __toESM(require("lodash"));
 const _SingleRelationRepository = class _SingleRelationRepository extends import_relation_repository.RelationRepository {
   async remove(options) {
     const transaction2 = await this.getTransaction(options);
@@ -104,7 +103,7 @@ const _SingleRelationRepository = class _SingleRelationRepository extends import
       throw new Error("The record does not exist");
     }
     await (0, import_update_associations.updateModelByValues)(target, options == null ? void 0 : options.values, {
-      ...import_lodash.default.omit(options, "values"),
+      ...options,
       transaction: transaction2
     });
     if (options.hooks !== false) {

package/lib/update-associations.d.ts

@@ -13,9 +13,7 @@ export declare function modelAssociations(instance: Model): {
     [key: string]: Association<import("sequelize").Model<any, any>, import("sequelize").Model<any, any>>;
 };
 export declare function belongsToManyAssociations(instance: Model): Array<BelongsToMany>;
-export declare function modelAssociationByKey(instance: Model, key: string): Association & {
-    update?: (instance: Model, value: any, options: UpdateAssociationOptions) => Promise<any>;
-};
+export declare function modelAssociationByKey(instance: Model, key: string): Association;
 type UpdateValue = {
     [key: string]: any;
 };
@@ -51,7 +49,7 @@ export declare function updateAssociations(instance: Model, values: any, options
  * @param value
  * @param options
  */
-export declare function updateAssociation(instance: Model, key: string, value: any, options?: UpdateAssociationOptions): Promise<any>;
+export declare function updateAssociation(instance: Model, key: string, value: any, options?: UpdateAssociationOptions): Promise<boolean>;
 /**
  * update belongsTo and HasOne
  * @param model

package/lib/update-associations.js

@@ -176,9 +176,6 @@ async function updateAssociation(instance, key, value, options = {}) {
   if (options.associationContext && isReverseAssociationPair(association, options.associationContext)) {
     return false;
   }
-  if (association.update) {
-    return association.update(instance, value, options);
-  }
   switch (association.associationType) {
     case "HasOne":
     case "BelongsTo":
@@ -258,7 +255,7 @@ async function updateSingleAssociation(model, key, value, options = {}) {
         if (association.associationType === "HasOne") {
           delete updateValues[association.foreignKey];
         }
-        await instance2.update(updateValues, { ...options, transaction });
+        await instance2.update(updateValues, { ...options, transaction, inputValues: updateValues });
       }
       await updateAssociations(instance2, value, {
         ...options,
@@ -274,7 +271,7 @@ async function updateSingleAssociation(model, key, value, options = {}) {
     values: value,
     operation: "create"
   });
-  const instance = await model[createAccessor](value, { context, transaction });
+  const instance = await model[createAccessor](value, { context, transaction, inputValues: value });
   await updateAssociations(instance, value, {
     ...options,
     transaction,
@@ -368,7 +365,7 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
         values: item,
         operation: "create"
       });
-      const instance = await model[createAccessor](item, accessorOptions);
+      const instance = await model[createAccessor](item, { ...accessorOptions, inputValues: item });
       await updateAssociations(instance, item, {
         ...options,
         transaction,
@@ -389,7 +386,7 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
           values: item,
           operation: "create"
         });
-        instance = await model[createAccessor](item, accessorOptions);
+        instance = await model[createAccessor](item, { ...accessorOptions, inputValues: item });
         await updateAssociations(instance, item, {
           ...options,
           transaction,
@@ -412,7 +409,7 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
           values: item,
           operation: "update"
         });
-        await instance.update(item, { ...options, transaction });
+        await instance.update(item, { ...options, transaction, inputValues: item });
       }
       await updateAssociations(instance, item, {
         ...options,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.9.0-beta.16",
+  "version": "1.9.0-beta.18",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.9.0-beta.16",
-    "@nocobase/utils": "1.9.0-beta.16",
+    "@nocobase/logger": "1.9.0-beta.18",
+    "@nocobase/utils": "1.9.0-beta.18",
     "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": "ff9b917d27840cc08e3f60d02384504ae0e35995"
+  "gitHead": "1c211ab8c30d9442c38d07e2ebef2c2935e0fbac"
 }