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

fixing merge issues

Browse Source
This commit is contained in:
Dayle Rees
2012-07-27 13:52:15 +01:00
parent da35e257fd b325e954e3
commit 2c6ed23b45
48 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
laravel/database/query.php
View File

@@ -158,7 +158,7 @@ class Query {
{
// If the "column" is really an instance of a Closure, the developer is
// trying to create a join with a complex "ON" clause. So, we will add
// the join, and then call the Closure with the join/
// the join, and then call the Closure with the join.
if ($column1 instanceof Closure)
{
$this->joins[] = new Query\Join($type, $table);
@@ -167,7 +167,7 @@ class Query {
}
// If the column is just a string, we can assume that the join just
// has a simple on clause, and we'll create the join instance and
// has a simple "ON" clause, and we'll create the join instance and
// add the clause automatically for the developer.
else
{
@@ -283,7 +283,7 @@ class Query {
*/
public function or_where_id($value)
{
return $this->or_where('id', '=', $value);
return $this->or_where('id', '=', $value);
}
/**
@@ -436,7 +436,7 @@ class Query {
foreach ($segments as $segment)
{
// If the segment is not a boolean connector, we can assume it it is
// If the segment is not a boolean connector, we can assume it is
// a column name, and we'll add it to the query as a new constraint
// of the query's where clause and keep iterating the segments.
if ($segment != '_and_' and $segment != '_or_')
@@ -659,7 +659,7 @@ class Query {
public function aggregate($aggregator, $columns)
{
// We'll set the aggregate value so the grammar does not try to compile
// a SELECT clause on the query. If an aggregator is present, it's own
// a SELECT clause on the query. If an aggregator is present, its own
// grammar function will be used to build the SQL syntax.
$this->aggregate = compact('aggregator', 'columns');
@@ -713,12 +713,12 @@ class Query {
{
// Force every insert to be treated like a batch insert to make creating
// the binding array simpler since we can just spin through the inserted
// rows as if there/ was more than one every time.
// rows as if there was more than one every time.
if ( ! is_array(reset($values))) $values = array($values);
$bindings = array();
// We need to merge the the insert values into the array of the query
// We need to merge the insert values into the array of the query
// bindings so that they will be bound to the PDO statement when it
// is executed by the database connection.
foreach ($values as $value)
@@ -819,7 +819,7 @@ class Query {
/**
* Execute the query as a DELETE statement.
*
* Optionally, an ID may be passed to the method do delete a specific row.
* Optionally, an ID may be passed to the method to delete a specific row.
*
* @param int $id
* @return int
@@ -836,7 +836,7 @@ class Query {
$sql = $this->grammar->delete($this);
return $this->connection->query($sql, $this->bindings);
return $this->connection->query($sql, $this->bindings);
}
/**