@nocobase/database 1.5.0-alpha.5 → 1.6.0-alpha.1

package/lib/update-associations.js

@@ -258,7 +258,11 @@ async function updateSingleAssociation(model, key, value, options = {}) {
         return;
       }
       if (updateAssociationValues.includes(key)) {
-        await instance2.update(value, { ...options, transaction });
+        const updateValues = { ...value };
+        if (association.associationType === "HasOne") {
+          delete updateValues[association.foreignKey];
+        }
+        await instance2.update(updateValues, { ...options, transaction });
       }
       await updateAssociations(instance2, value, {
         ...options,
@@ -298,7 +302,7 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
   const setAccessor = association.accessors.set;
   const createAccessor = association.accessors.create;
   if (isUndefinedOrNull(value)) {
-    await model[setAccessor](null, { transaction, context, individualHooks: true });
+    await model[setAccessor](null, { transaction, context, individualHooks: true, validate: false });
     model.setDataValue(key, null);
     return;
   }
@@ -306,7 +310,7 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
     throw new Error(`The source key ${association.sourceKeyAttribute} is not set in ${model.constructor.name}`);
   }
   if (isStringOrNumber(value)) {
-    await model[setAccessor](value, { transaction, context, individualHooks: true });
+    await model[setAccessor](value, { transaction, context, individualHooks: true, validate: false });
     return;
   }
   value = import_lodash.default.castArray(value);
@@ -334,7 +338,7 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
       objectItems.push(item);
     }
   }
-  await model[setAccessor](setItems, { transaction, context, individualHooks: true });
+  await model[setAccessor](setItems, { transaction, context, individualHooks: true, validate: false });
   const newItems = [];
   const pk = association.target.primaryKeyAttribute;
   let targetKey = pk;
@@ -393,6 +397,9 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
         continue;
       }
       if (updateAssociationValues.includes(key)) {
+        if (association.associationType === "HasMany") {
+          delete item[association.foreignKey];
+        }
         await instance.update(item, { ...options, transaction });
       }
       await updateAssociations(instance, item, {

package/lib/view/view-inference.js

@@ -62,7 +62,7 @@ const _ViewFieldInference = class _ViewFieldInference {
     });
     const rawFields = [];
     for (const [name, column] of Object.entries(columns)) {
-      const inferResult = { name, rawType: column.type };
+      const inferResult = { name, rawType: column.type, field: name };
       const usage = columnUsage[name];
       if (usage) {
         const collection = db.tableNameCollectionMap.get(

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.5.0-alpha.5",
+  "version": "1.6.0-alpha.1",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.5.0-alpha.5",
-    "@nocobase/utils": "1.5.0-alpha.5",
+    "@nocobase/logger": "1.6.0-alpha.1",
+    "@nocobase/utils": "1.6.0-alpha.1",
     "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": "8d24e8d2c0f3f57ceaa271438fd93db2b4150011"
+  "gitHead": "a4c91015e34ec0c9a427451b5fbdfb5fedc4f3d7"
 }