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

Grammar/Vocabulary fixes

Browse Source 
Signed-off-by: Chris Berthe <chrisberthe@gmail.com>
This commit is contained in:
Chris Berthe
2012-06-13 11:19:20 -04:00
parent d9802fe656
commit fafaf724b0
54 changed files with 130 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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,8 +167,8 @@ 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
// add the clause automatically for the develoepr.
// has a simple "ON" clause, and we'll create the join instance and
// add the clause automatically for the developer.
else
{
$join = new Query\Join($type, $table);
@@ -453,7 +453,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_')
@@ -676,7 +676,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');
@@ -730,12 +730,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)
@@ -836,7 +836,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