Grammar/Vocabulary fixes
Signed-off-by: Chris Berthe <chrisberthe@gmail.com>
This commit is contained in:
@@ -13,7 +13,7 @@ class Grammar extends \Laravel\Database\Grammar {
|
||||
public $datetime = 'Y-m-d H:i:s';
|
||||
|
||||
/**
|
||||
* All of the query componenets in the order they should be built.
|
||||
* All of the query components in the order they should be built.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
@@ -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);
|
||||
@@ -149,7 +149,7 @@ class Grammar extends \Laravel\Database\Grammar {
|
||||
|
||||
// The first clause will have a connector on the front, but it is
|
||||
// not needed on the first condition, so we will strip it off of
|
||||
// the condition before adding it to the arrya of joins.
|
||||
// the condition before adding it to the array of joins.
|
||||
$search = array('AND ', 'OR ');
|
||||
|
||||
$clauses[0] = str_replace($search, '', $clauses[0]);
|
||||
@@ -376,7 +376,7 @@ class Grammar extends \Laravel\Database\Grammar {
|
||||
}
|
||||
|
||||
/**
|
||||
* Compile a SQL INSERT and get ID statment from a Query instance.
|
||||
* Compile a SQL INSERT and get ID statement from a Query instance.
|
||||
*
|
||||
* @param Query $query
|
||||
* @param array $values
|
||||
@@ -389,7 +389,7 @@ class Grammar extends \Laravel\Database\Grammar {
|
||||
}
|
||||
|
||||
/**
|
||||
* Compile a SQL UPDATE statment from a Query instance.
|
||||
* Compile a SQL UPDATE statement from a Query instance.
|
||||
*
|
||||
* @param Query $query
|
||||
* @param array $values
|
||||
@@ -416,7 +416,7 @@ class Grammar extends \Laravel\Database\Grammar {
|
||||
}
|
||||
|
||||
/**
|
||||
* Compile a SQL DELETE statment from a Query instance.
|
||||
* Compile a SQL DELETE statement from a Query instance.
|
||||
*
|
||||
* @param Query $query
|
||||
* @return string
|
||||
|
||||
@@ -5,7 +5,7 @@ use Laravel\Database\Query;
|
||||
class Postgres extends Grammar {
|
||||
|
||||
/**
|
||||
* Compile a SQL INSERT and get ID statment from a Query instance.
|
||||
* Compile a SQL INSERT and get ID statement from a Query instance.
|
||||
*
|
||||
* @param Query $query
|
||||
* @param array $values
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user