DbalMapper - clearCollectionCache also clears relationship mapper cache

nextras · Feb 17, 2017 · 0dd82ca · 0dd82ca
1 parent 85cff54
commit 0dd82ca
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/Mapper/Dbal/DbalMapper.php b/src/Mapper/Dbal/DbalMapper.php
@@ -88,6 +88,14 @@ public function toCollection($data)
 	}
 
 
+	/** @inheritdoc */
+	public function clearCollectionCache()
+	{
+		parent::clearCollectionCache();
+		$this->cacheRM = [];
+	}
+
+
 	public function getManyHasManyParameters(PropertyMetadata $sourceProperty, IMapper $targetMapper)
 	{
 		return [

diff --git a/tests/cases/integration/Model/model.clearIdentityMapAndCaches().phpt b/tests/cases/integration/Model/model.clearIdentityMapAndCaches().phpt
@@ -21,6 +21,8 @@ class ModelClearIdentityMapAndCachesTest extends DataTestCase
 	public function testBasics()
 	{
 		$book1 = $this->orm->books->getById(1);
+		$author1 = $book1->author;
+		$author1Id = $author1->id;
 		$book2 = $this->orm->books->getById(1);
 
 		Assert::equal($book1, $book2);
@@ -29,6 +31,9 @@ class ModelClearIdentityMapAndCachesTest extends DataTestCase
 
 		$book3 = $this->orm->books->getById(1);
 		Assert::notEqual($book1, $book3);
+		$author3 = $book3->author;
+		Assert::notEqual($author1, $author3);
+		Assert::same($author1Id, $author3->id);
 	}