Merge pull request #228 from analogueorm/fix/null-foreign-key

Make sure related entity objects are in sync

src/Commands/Store.php

@@ -61,6 +61,8 @@ public function execute()
             $mapper->getInstanceCache()->add($entity, $key);
         }
 
+        $wrappedEntity->unwrap();
+
         return $entity;
     }
 
@@ -187,6 +189,22 @@ protected function insert()
             $id = $this->query->insertGetId($attributes, $sequence);
 
             $aggregate->setEntityAttribute($keyName, $id);
+
+            $this->syncAttributes($attributes);
+        }
+    }
+
+    /**
+     * Update attributes on actual entity.
+     *
+     * @param array $attributes
+     *
+     * @return void
+     */
+    protected function syncAttributes(array $attributes)
+    {
+        foreach ($attributes as $key => $value) {
+            $this->aggregate->setEntityAttribute($key, $value);
         }
     }
 
@@ -208,6 +226,7 @@ protected function update()
 
         if (count($dirtyAttributes) > 0) {
             $this->query->update($dirtyAttributes);
+            $this->syncAttributes($dirtyAttributes);
         }
     }
 }

tests/cases/Relationships/HasManyTest.php

@@ -496,8 +496,6 @@ public function child(Bar $bar)
         $foo->childs->push($barA);
         $foo->parents->push($barB);
 
-        $this->logQueries();
-
         $mapper = $this->mapper(Foo::class);
         $mapper->store($foo);