修正关联更新问题

Author: liu21st

src/Model.php

@@ -318,7 +318,7 @@ public function save(array | object $data = [], $where = []): bool
 
 
         foreach ($data as $name => &$val) {
-            if ($val instanceof Model) {
+            if ($val instanceof Modelable) {
                 $relations[$name] = $val;
                 unset($data[$name]);
             } elseif ($val instanceof Collection || !in_array($name, $allow)) {
@@ -351,7 +351,7 @@ public function save(array | object $data = [], $where = []): bool
 
         // 保存关联数据
         if (!empty($relations)) {
-            $this->relationSave($relations);
+            $this->relationSave($relations, $isUpdate);
         }
 
         // 重置原始数据

src/model/concern/RelationShip.php

@@ -107,17 +107,14 @@ public function getRelation(string $relation): array
      * 写入模型关联数据（一对一）.
      *
      * @param array $relations 数据
+     * @param bool  $isUpdate  是否更新
      * @return void
      */
-    private function relationSave(array $relations = [])
+    private function relationSave(array $relations = [], bool $isUpdate = true)
     {
         foreach ($relations as $name => $relation) {
             if ($relation && in_array($name, $this->getOption('together'))) {
-                $relationKey = $this->getRelationKey($name);
-                if ($relationKey) {
-                    $relation->$relationKey = $this->getKey();
-                }
-                $relation->save();
+                $isUpdate ? $relation->save() : $this->$name()->save($relation);
             }
         }
     }

tests/orm/ModelFieldTypeTest.php

@@ -57,13 +57,13 @@ public function testFieldTypeSelect()
     public function testFieldReadAndWrite()
     {
         /** @var FieldTypeModel $result */
-        $result = FieldTypeModel::query()->where('id', '=', 3)->find();
+        $result = FieldTypeModel::where('id', '=', 3)->find();
         $result->t_json = new TestFieldJsonDTO(30, 'ddd');
         $result->t_php = new TestFieldPhpDTO(40, 'eee');
         $result->save();
 
         /** @var FieldTypeModel $result */
-        $result = FieldTypeModel::query()->where('id', '=', 3)->find();
+        $result = FieldTypeModel::where('id', '=', 3)->find();
         $this->assertEquals(new TestFieldJsonDTO(30, 'ddd'), $result->t_json);
         $this->assertEquals((string) new TestFieldPhpDTO(40, 'eee'), (string) $result->t_php);
         $this->assertEquals($result->id, $result->t_php->getId());