From 8c2a4fba14015f166451f25f6c9ef3f87c0fe51a Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Thu, 12 Jul 2012 23:20:17 +0300
Subject: [PATCH] The Eloquent model includes can now be taken directly from
 the model when assembling the query.

---
 laravel/database/eloquent/query.php | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/laravel/database/eloquent/query.php b/laravel/database/eloquent/query.php
index 3aee79c9..25fa4fbc 100644
--- a/laravel/database/eloquent/query.php
+++ b/laravel/database/eloquent/query.php
@@ -127,7 +127,7 @@ public function hydrate($model, $results)
 
 		if (count($results) > 0)
 		{
-			foreach ($this->model_includes() as $relationship => $constraints)
+			foreach ($this->model->includes as $relationship => $constraints)
 			{
 				// If the relationship is nested, we will skip loading it here and let
 				// the load method parse and set the nested eager loads on the right
@@ -196,7 +196,7 @@ protected function nested_includes($relationship)
 	{
 		$nested = array();
 
-		foreach ($this->model_includes() as $include => $constraints)
+		foreach ($this->model->includes as $include => $constraints)
 		{
 			// To get the nested includes, we want to find any includes that begin
 			// the relationship and a dot, then we will strip off the leading
@@ -210,31 +210,6 @@ protected function nested_includes($relationship)
 		return $nested;
 	}
 
-	/**
-	 * Get the eagerly loaded relationships for the model.
-	 *
-	 * @return array
-	 */
-	protected function model_includes()
-	{
-		$includes = array();
-
-		foreach ($this->model->includes as $relationship => $constraints)
-		{
-			// When eager loading relationships, constraints may be set on the eager
-			// load definition; however, is none are set, we need to swap the key
-			// and the value of the array since there are no constraints.
-			if (is_numeric($relationship))
-			{
-				list($relationship, $constraints) = array($constraints, null);
-			}
-
-			$includes[$relationship] = $constraints;
-		}
-
-		return $includes;
-	}
-
 	/**
 	 * Get a fluent query builder for the model.
 	 *