From 39df69fdc1a4c00fea078d11d2421fbb18661da3 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Thu, 28 Jun 2012 18:33:45 +0300 Subject: [PATCH] Allow more than just WHERE clauses on eager load constraints. --- laravel/database/query.php | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/laravel/database/query.php b/laravel/database/query.php index 83c92b83..915f7c80 100644 --- a/laravel/database/query.php +++ b/laravel/database/query.php @@ -395,7 +395,7 @@ public function or_where_not_null($column) } /** - * Add a nested where condition to the query. + * Add nested constraints to the query. * * @param Closure $callback * @param string $connector @@ -403,24 +403,7 @@ public function or_where_not_null($column) */ 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; }