@nocobase/database 2.0.0-alpha.48 → 2.0.0-alpha.49

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.js

@@ -220,11 +220,11 @@ async function updateSingleAssociation(model, key, value, options = {}) {
     }
   }, "checkBelongsToForeignKeyValue");
   if ((0, import_utils.isStringOrNumber)(value)) {
-    await model[setAccessor](value, { context, transaction, associationKey: key });
+    await model[setAccessor](value, { context, transaction });
     return true;
   }
   if (value instanceof import_model.Model) {
-    await model[setAccessor](value, { context, transaction, associationKey: key });
+    await model[setAccessor](value, { context, transaction });
     model.setDataValue(key, value);
     return true;
   }
@@ -255,7 +255,7 @@ async function updateSingleAssociation(model, key, value, options = {}) {
         if (association.associationType === "HasOne") {
           delete updateValues[association.foreignKey];
         }
-        await instance2.update(updateValues, { ...options, transaction, associationKey: key });
+        await instance2.update(updateValues, { ...options, transaction, inputValues: updateValues });
       }
       await updateAssociations(instance2, value, {
         ...options,
@@ -271,7 +271,7 @@ async function updateSingleAssociation(model, key, value, options = {}) {
     values: value,
     operation: "create"
   });
-  const instance = await model[createAccessor](value, { context, transaction, associationKey: key });
+  const instance = await model[createAccessor](value, { context, transaction, inputValues: value });
   await updateAssociations(instance, value, {
     ...options,
     transaction,
@@ -365,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,
@@ -386,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,
@@ -409,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": "2.0.0-alpha.48",
+  "version": "2.0.0-alpha.49",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "2.0.0-alpha.48",
-    "@nocobase/utils": "2.0.0-alpha.48",
+    "@nocobase/logger": "2.0.0-alpha.49",
+    "@nocobase/utils": "2.0.0-alpha.49",
     "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": "456be3a6e92f984fe283590c80d3ea9423695ba6"
+  "gitHead": "99f71bc8961da62a761630b3eae11092a4372e3e"
 }