Fix bug with eager loading

Bug occured when accessing relations on a relation that was being iterated over
Level-2 · Aug 16, 2020 · 8a2b22a · 8a2b22a
1 parent 72aaf1c
commit 8a2b22a
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/Maphper/Relation/One.php b/Maphper/Relation/One.php
@@ -59,7 +59,8 @@ private function loadDataIntoSiblings($results) {
 		}
 
 		foreach ($this->siblings as $sibling) {
-            if (isset($cache[$sibling->parentObject->{$this->parentField}])) $sibling->data = $cache[$sibling->parentObject->{$this->parentField}];
+            if ($sibling->parentField === $this->parentField &&
+                isset($cache[$sibling->parentObject->{$this->parentField}]))$sibling->data = $cache[$sibling->parentObject->{$this->parentField}];
 		}
 		/*
 		foreach ($this->siblings as $sibling) {

diff --git a/tests/MySqlDatabaseTest.php b/tests/MySqlDatabaseTest.php
@@ -1527,6 +1527,39 @@ public function testPkAccessWithFilter() {
 		$this->assertFalse(isset($mapper[3]->id));
 	}
 
+	public function testOneRelationsDuringIteration() {
+        $this->dropTable('site');
+        $this->dropTable('blog');
+        $this->dropTable('author');
+        $this->dropTable('content');
+
+        $sites = new \Maphper\Maphper($this->getDataSource('site', 'id', ['editmode' => true]));
+        $blogs = new \Maphper\Maphper($this->getDataSource('blog', 'id', ['editmode' => true]));
+        $authors = new \Maphper\Maphper($this->getDataSource('author', 'id', ['editmode' => true]));
+        $content = new \Maphper\Maphper($this->getDataSource('content', 'id', ['editmode' => true]));
+
+        $blogs->addRelation('author', new \Maphper\Relation\One($authors, 'authorId', 'id'));
+        $blogs->addRelation('content', new \Maphper\Relation\One($content, 'cId', 'id'));
+        $sites->addRelation('blogs', new \Maphper\Relation\Many($blogs, 'id', 'sId'));
+
+        $sites[1] = (object)[];
+        $blogs[1] = (object)[
+            'sId' => 1,
+            'authorId' => 1,
+            'cId' => 1,
+        ];
+        $authors[1] = (object)[
+            'name' => 'Tester',
+        ];
+        $content[1] = (object)[
+            'text' => 'Filler',
+        ];
+
+        $iter = $sites[1]->blogs->getIterator();
+        $currentBlog = $iter->current();
+        $this->assertEquals('Tester', $currentBlog->author->name);
+        $this->assertEquals('Filler', $currentBlog->content->text);
+    }
 
 	public function testInsertNoEditModeNoColumn() {