relationship: reading removed entity retracks it (#510)

nextras · Apr 4, 2021 · 2e2cdb7 · 2e2cdb7
1 parent 97e9e89
commit 2e2cdb7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/src/Relationships/HasMany.php b/src/Relationships/HasMany.php
@@ -164,6 +164,7 @@ public function add($entity): ?IEntity
 
 		if (isset($this->toRemove[$entityHash])) {
 			unset($this->toRemove[$entityHash]);
+			$this->tracked[$entityHash] = $entity;
 		} else {
 			$this->toAdd[$entityHash] = $entity;
 		}

diff --git a/tests/cases/integration/Relationships/relationships.manyHasMany.phpt b/tests/cases/integration/Relationships/relationships.manyHasMany.phpt
@@ -313,7 +313,7 @@ class RelationshipManyHasManyTest extends DataTestCase
 		$property->set([1, 2]);
 
 		$book = $this->orm->books->getByIdChecked(1);
-		Assert::count(0, $book->tags->getEntitiesForPersistence());
+		Assert::count(1, $book->tags->getEntitiesForPersistence());
 	}
 }
 

diff --git a/tests/cases/integration/Relationships/relationships.oneHasMany.collection.phpt b/tests/cases/integration/Relationships/relationships.oneHasMany.collection.phpt
@@ -422,6 +422,22 @@ class RelationshipsOneHasManyCollectionTest extends DataTestCase
 	}
 
 
+	public function testReAdd(): void
+	{
+		$queries = $this->getQueries(function (): void {
+			Assert::count(0, $this->authorA->books->getEntitiesForPersistence());
+			iterator_to_array($this->authorA->books); // SELECT ALL
+			Assert::count(2, $this->authorA->books->getEntitiesForPersistence());
+			$this->authorA->books->set(iterator_to_array($this->authorA->books));
+			Assert::count(2, $this->authorA->books->getEntitiesForPersistence());
+		});
+
+		if ($queries !== null) {
+			Assert::count(1, $queries);
+		}
+	}
+
+
 	private function createBook(): Book
 	{
 		static $id = 0;