@nocobase/database 2.0.0-alpha.42 → 2.0.0-alpha.44

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/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":
@@ -223,11 +220,11 @@ async function updateSingleAssociation(model, key, value, options = {}) {
     }
   }, "checkBelongsToForeignKeyValue");
   if ((0, import_utils.isStringOrNumber)(value)) {
-    await model[setAccessor](value, { context, transaction });
+    await model[setAccessor](value, { context, transaction, associationKey: key });
     return true;
   }
   if (value instanceof import_model.Model) {
-    await model[setAccessor](value, { context, transaction });
+    await model[setAccessor](value, { context, transaction, associationKey: key });
     model.setDataValue(key, value);
     return true;
   }
@@ -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, associationKey: key });
       }
       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, associationKey: key });
   await updateAssociations(instance, value, {
     ...options,
     transaction,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.0.0-alpha.42",
+  "version": "2.0.0-alpha.44",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "2.0.0-alpha.42",
-    "@nocobase/utils": "2.0.0-alpha.42",
+    "@nocobase/logger": "2.0.0-alpha.44",
+    "@nocobase/utils": "2.0.0-alpha.44",
     "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": "9e96dd78d0c1445c8da76863e30f046be5b48d90"
+  "gitHead": "075bd484c270740fe9b02f1989818da91139b6b9"
 }