persistence: fixed repeated persistence of relationships [closes #162]

nextras · Mar 14, 2016 · 9cdbdea · 9cdbdea
1 parent cffc101
commit 9cdbdea
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 13 deletions.
diff --git a/src/Relationships/HasMany.php b/src/Relationships/HasMany.php
@@ -45,6 +45,9 @@ abstract class HasMany extends Object implements IRelationshipCollection
 	/** @var bool */
 	protected $isModified = false;
 
+	/** @var bool */
+	protected $wasLoaded = false;
+
 	/** @var IRelationshipMapper */
 	protected $relationshipMapper;
 
@@ -188,7 +191,7 @@ public function getIterator()
 
 	public function isLoaded()
 	{
-		return !($this->collection === null && empty($this->toAdd) && empty($this->toRemove));
+		return $this->wasLoaded || $this->collection !== null || !empty($this->toAdd) || !empty($this->toRemove);
 	}
 
 

diff --git a/src/Relationships/ManyHasMany.php b/src/Relationships/ManyHasMany.php
@@ -19,8 +19,8 @@ public function getEntitiesForPersistence()
 		foreach ($this->toAdd as $entity) {
 			$entities[] = $entity;
 		}
-		if ($this->collection) {
-			foreach ($this->collection as $entity) {
+		if ($this->collection || $this->wasLoaded) {
+			foreach ($this->getIterator() as $entity) {
 				$entities[] = $entity;
 			}
 		}
@@ -41,10 +41,13 @@ public function doPersist()
 			$toAdd[$id] = $id;
 		}
 
-		$this->toAdd = [];
-		$this->toRemove = [];
-		$this->isModified = false;
-		$this->collection = null;
+		if ($this->isModified) {
+			$this->toAdd = [];
+			$this->toRemove = [];
+			$this->isModified = false;
+			$this->collection = null;
+			$this->wasLoaded = true;
+		}
 
 		if ($this->metadata->relationship->isMain) {
 			$this->getRelationshipMapper()->remove($this->parent, $toRemove);

diff --git a/src/Relationships/OneHasMany.php b/src/Relationships/OneHasMany.php
@@ -24,7 +24,7 @@ public function getEntitiesForPersistence()
 				$entities[] = $remove;
 			}
 		}
-		if ($this->collection !== null) {
+		if ($this->collection !== null || $this->wasLoaded) {
 			foreach ($this->getIterator() as $entity) {
 				$entities[] = $entity;
 			}
@@ -35,10 +35,13 @@ public function getEntitiesForPersistence()
 
 	public function doPersist()
 	{
-		$this->toAdd = [];
-		$this->toRemove = [];
-		$this->collection = null;
-		$this->isModified = false;
+		if ($this->isModified) {
+			$this->toAdd = [];
+			$this->toRemove = [];
+			$this->collection = null;
+			$this->isModified = false;
+			$this->wasLoaded = true;
+		}
 	}
 
 

diff --git a/tests/cases/integration/Relationships/relationships.manyHasMany.phpt b/tests/cases/integration/Relationships/relationships.manyHasMany.phpt
@@ -143,6 +143,26 @@ class RelationshipManyHasManyTest extends DataTestCase
 		Assert::same(0, $tags->count());
 	}
 
+
+	public function testRepeatedPersisting()
+	{
+		$tagA = new Tag('A');
+		$tagB = new Tag('B');
+
+		$book = $this->orm->books->getById(1);
+		$book->tags->add($tagA);
+		$book->tags->add($tagB);
+
+		$this->orm->persistAndFlush($book);
+		Assert::false($tagA->isModified());
+		Assert::false($tagB->isModified());
+
+		$tagA->name = 'X';
+		$this->orm->persistAndFlush($book);
+		Assert::false($tagA->isModified());
+		Assert::false($tagB->isModified());
+	}
+
 }
 
 

diff --git a/tests/cases/integration/Relationships/relationships.oneHasMany.isLoaded().phpt b/tests/cases/integration/Relationships/relationships.oneHasMany.isLoaded().phpt
@@ -29,7 +29,7 @@ class RelationshipsOneHasManyIsLoadedTest extends TestCase
 		$this->orm->authors->flush();
 
 		foreach ($this->orm->authors->findAll() as $author) {
-			Assert::false($author->books->isLoaded());
+			Assert::true($author->books->isLoaded());
 		}
 
 		foreach ($this->orm->authors->findAll() as $author) {

diff --git a/tests/cases/integration/Relationships/relationships.oneHasMany.persistence.phpt b/tests/cases/integration/Relationships/relationships.oneHasMany.persistence.phpt
@@ -10,6 +10,7 @@ use Mockery;
 use NextrasTests\Orm\Author;
 use NextrasTests\Orm\Book;
 use NextrasTests\Orm\DataTestCase;
+use NextrasTests\Orm\Publisher;
 use Tester\Assert;
 
 $dic = require_once __DIR__ . '/../../../bootstrap.php';
@@ -42,7 +43,28 @@ class RelationshipsOneHasManyPersistenceTest extends DataTestCase
 		foreach ($books as $book) {
 			Assert::false($book->isModified());
 		}
+	}
+
+
+	public function testRepeatedPersisting()
+	{
+		$publisher = new Publisher();
+		$publisher->name = 'Jupiter Mining Corporation';
+
+		$author = new Author();
+		$author->name = 'Arnold Judas Rimmer';
+
+		$book = new Book();
+		$book->title = 'Better Than Life';
+		$book->publisher = $publisher;
+		$book->author = $author;
+
+		$this->orm->persistAndFlush($author);
+		Assert::false($book->isModified());
 
+		$book->title = 'Backwards';
+		$this->orm->persistAndFlush($author);
+		Assert::false($book->isModified());
 	}
 
 }