ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Chris Berthe
2012-07-12 11:15:43 -04:00
parent 3b6191ec16 1503aed7ce
commit b325e954e3
25 changed files with 538 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
laravel/database/query.php
View File

@@ -140,7 +140,7 @@ class Query {
*/
public function select($columns = array('*'))
{
$this->selects = (array) $columns;
$this->selects = is_array($columns) ? $columns : array($columns);
return $this;
}
@@ -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;
}