@nocobase/database 1.2.10-alpha → 1.2.12-alpha

package/lib/collection.js

@@ -64,6 +64,8 @@ function EnsureAtomicity(target, propertyKey, descriptor) {
     const model = this.model;
     const beforeAssociationKeys = Object.keys(model.associations);
     const beforeRawAttributes = Object.keys(model.rawAttributes);
+    const fieldName = args[0];
+    const beforeField = this.getField(fieldName);
     try {
       return originalMethod.apply(this, args);
     } catch (error) {
@@ -77,6 +79,9 @@ function EnsureAtomicity(target, propertyKey, descriptor) {
       for (const key of createdRawAttributes) {
         delete this.model.rawAttributes[key];
       }
+      if (!beforeField) {
+        this.removeField(fieldName);
+      }
       throw error;
     }
   };

package/lib/update-associations.js

@@ -356,6 +356,9 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
     if (throughValue) {
       accessorOptions["through"] = throughValue;
     }
+    if (pk !== targetKey && !isUndefinedOrNull(item[pk]) && isUndefinedOrNull(item[targetKey])) {
+      throw new Error(`${targetKey} field value is empty`);
+    }
     if (isUndefinedOrNull(item[targetKey])) {
       const instance = await model[createAccessor](item, accessorOptions);
       await updateAssociations(instance, item, {

package/lib/update-guard.js

@@ -138,6 +138,7 @@ const _UpdateGuard = class _UpdateGuard {
       let associationValues = associationsValues[association];
       const associationObj = associations[association];
       const filterAssociationToBeUpdate = /* @__PURE__ */ __name((value) => {
+        var _a;
         if (value === null) {
           return value;
         }
@@ -145,7 +146,7 @@ const _UpdateGuard = class _UpdateGuard {
         if (associationKeysToBeUpdate.includes(association)) {
           return value;
         }
-        const associationKeyName = associationObj.targetKey ? associationObj.targetKey : associationObj.target.primaryKeyAttribute;
+        const associationKeyName = ((_a = associationObj == null ? void 0 : associationObj["options"]) == null ? void 0 : _a.targetKey) ? associationObj["options"].targetKey : associationObj.target.primaryKeyAttribute;
         if (value[associationKeyName]) {
           return import_lodash.default.pick(value, [associationKeyName, ...Object.keys(associationObj.target.associations)]);
         }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.2.10-alpha",
+  "version": "1.2.12-alpha",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.2.10-alpha",
-    "@nocobase/utils": "1.2.10-alpha",
+    "@nocobase/logger": "1.2.12-alpha",
+    "@nocobase/utils": "1.2.12-alpha",
     "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": "378bfb33c8d124ef79074e5474c1cf2199aeb8da"
+  "gitHead": "553231d4882496cb7f1f17fa7541899ce82a27ab"
 }