relationships: derived collection is not cached & stored in collectio…

…n itself
nextras · Jan 28, 2017 · 3d26439 · 3d26439
1 parent 32aae90
commit 3d26439
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Relationships/HasMany.php b/src/Relationships/HasMany.php
@@ -294,7 +294,10 @@ protected function getCollection($forceNew = false)
 			$collection = $this->applyDefaultOrder($collection);
 		}
 
-		return $this->collection = $collection;
+		if (!$forceNew) {
+			$this->collection = $collection;
+		}
+		return $collection;
 	}
 
 

diff --git a/tests/cases/integration/Relationships/relationships.oneHasMany.collection.phpt b/tests/cases/integration/Relationships/relationships.oneHasMany.collection.phpt
@@ -289,6 +289,24 @@ class RelationshipsOneHasManyCollectionTest extends DataTestCase
 	}
 
 
+	public function testFetchDerivedCollection()
+	{
+		$queries = $this->getQueries(function () {
+			Assert::count(0, $this->books->getEntitiesForPersistence());
+
+			$this->books->add($this->createBook());
+			Assert::count(1, $this->books->getEntitiesForPersistence());
+
+			$this->books->get()->fetchAll();
+			Assert::count(1, $this->books->getEntitiesForPersistence());
+		});
+
+		if ($queries) {
+			Assert::count(1, $queries); // SELECT NONSENCE
+		}
+	}
+
+
 	public function testRemoveA()
 	{
 		$queries = $this->getQueries(function () {