Fix Eloquent eager loading matching.

2012-04-23 16:08:57 -05:00
parent b65fa7040d
commit 94948cf675
8 changed files with 53 additions and 42 deletions
--- a/laravel/database/eloquent/relationships/has_one.php
+++ b/laravel/database/eloquent/relationships/has_one.php
@@ -38,9 +38,14 @@ class Has_One extends Has_One_Or_Many {
 	{
 		$foreign = $this->foreign_key();

-		foreach ($children as $key => $child)
+		foreach ($parents as &$parent)
 		{
-			$parents[$child->$foreign]->relationships[$relationship] = $child;
+			$matching = array_first($children, function($k, $v) use ($parent, $foreign)
+			{
+				return $v->$foreign == $parent->get_key();
+			});
+
+			$parent->relationships[$relationship] = $matching;
 		}
 	}