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

4
laravel/database/query/grammars/grammar.php
View File

@@ -125,7 +125,7 @@ class Grammar extends \Laravel\Database\Grammar {
protected function joins(Query $query)
{
// We need to iterate through each JOIN clause that is attached to the
// query an translate it into SQL. The table and the columns will be
// query and translate it into SQL. The table and the columns will be
// wrapped in identifiers to avoid naming collisions.
foreach ($query->joins as $join)
{
@@ -135,7 +135,7 @@ class Grammar extends \Laravel\Database\Grammar {
// Each JOIN statement may have multiple clauses, so we will iterate
// through each clause creating the conditions then we'll join all
// of the together at the end to build the clause.
// of them together at the end to build the clause.
foreach ($join->clauses as $clause)
{
extract($clause);

2
laravel/database/query/grammars/sqlserver.php
View File

@@ -95,7 +95,7 @@ class SQLServer extends Grammar {
// Next we need to calculate the constraint that should be placed on
// the row number to get the correct offset and limit on the query.
// If there is not limit, we'll just handle the offset.
// If there is not a limit, we'll just handle the offset.
if ($query->limit > 0)
{
$finish = $query->offset + $query->limit;