Browse Source

Merge pull request #874 from franzliedke/patch-16

[Eloquent] Constraining eager loads only allows WHERE clauses
Taylor Otwell 12 years ago
parent
commit
8198dc23f3
1 changed files with 2 additions and 19 deletions
  1. 2 19
      laravel/database/query.php

+ 2 - 19
laravel/database/query.php

@@ -395,7 +395,7 @@ class Query {
 	}
 
 	/**
-	 * Add a nested where condition to the query.
+	 * Add nested constraints to the query.
 	 *
 	 * @param  Closure  $callback
 	 * @param  string   $connector
@@ -403,24 +403,7 @@ class Query {
 	 */
 	public function where_nested($callback, $connector = 'AND')
 	{
-		$type = 'where_nested';
-
-		// To handle a nested where statement, we will actually instantiate a new
-		// Query instance and run the callback over that instance, which will
-		// allow the developer to have a fresh query instance
-		$query = new Query($this->connection, $this->grammar, $this->from);
-
-		call_user_func($callback, $query);
-
-		// Once the callback has been run on the query, we will store the nested
-		// query instance on the where clause array so that it's passed to the
-		// query's query grammar instance when building.
-		if ($query->wheres !== null)
-		{
-			$this->wheres[] = compact('type', 'query', 'connector');
-		}
-
-		$this->bindings = array_merge($this->bindings, $query->bindings);
+		call_user_func($callback, $this);
 
 		return $this;
 	}