From 9e40cc5268f525049779f673a618763ab924041a Mon Sep 17 00:00:00 2001 From: Cody Covey Date: Wed, 30 Oct 2013 01:22:00 -0500 Subject: [PATCH 1/4] cast offset to int --- laravel/database/query/grammars/grammar.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/laravel/database/query/grammars/grammar.php b/laravel/database/query/grammars/grammar.php index d5d8a2e7d..a045b011f 100755 --- a/laravel/database/query/grammars/grammar.php +++ b/laravel/database/query/grammars/grammar.php @@ -366,7 +366,7 @@ class Grammar extends \Laravel\Database\Grammar { */ protected function offset(Query $query) { - return 'OFFSET '.$query->offset; + return 'OFFSET '. (int) $query->offset; } /** @@ -488,4 +488,4 @@ class Grammar extends \Laravel\Database\Grammar { return trim($sql); } -} \ No newline at end of file +} From f3370110b31aec5c4369d56d063b06eb2f1d3670 Mon Sep 17 00:00:00 2001 From: Cody Covey Date: Wed, 30 Oct 2013 01:26:03 -0500 Subject: [PATCH 2/4] cast int for offset and limit --- laravel/database/query/grammars/sqlserver.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/laravel/database/query/grammars/sqlserver.php b/laravel/database/query/grammars/sqlserver.php index f912f562f..018ac898f 100644 --- a/laravel/database/query/grammars/sqlserver.php +++ b/laravel/database/query/grammars/sqlserver.php @@ -91,14 +91,14 @@ class SQLServer extends Grammar { unset($components['orderings']); - $start = $query->offset + 1; + $start = (int) $query->offset + 1; // 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 a limit, we'll just handle the offset. if ($query->limit > 0) { - $finish = $query->offset + $query->limit; + $finish = (int) $query->offset + (int) $query->limit; $constraint = "BETWEEN {$start} AND {$finish}"; } @@ -137,4 +137,4 @@ class SQLServer extends Grammar { return ''; } -} \ No newline at end of file +} From f235e47f29171296b98a9a4fb9834b1008ee0790 Mon Sep 17 00:00:00 2001 From: Cody Covey Date: Wed, 30 Oct 2013 01:27:08 -0500 Subject: [PATCH 3/4] might as well cast limit as well --- laravel/database/query/grammars/grammar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/database/query/grammars/grammar.php b/laravel/database/query/grammars/grammar.php index a045b011f..3f2f78b77 100755 --- a/laravel/database/query/grammars/grammar.php +++ b/laravel/database/query/grammars/grammar.php @@ -355,7 +355,7 @@ class Grammar extends \Laravel\Database\Grammar { */ protected function limit(Query $query) { - return 'LIMIT '.$query->limit; + return 'LIMIT '. (int) $query->limit; } /** From b956efe29f86ad1059387b54b31e01133e8aa2a8 Mon Sep 17 00:00:00 2001 From: Cody Covey Date: Wed, 30 Oct 2013 08:20:35 -0500 Subject: [PATCH 4/4] Update sqlserver.php --- laravel/database/query/grammars/sqlserver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/database/query/grammars/sqlserver.php b/laravel/database/query/grammars/sqlserver.php index 018ac898f..4af8a0d4f 100644 --- a/laravel/database/query/grammars/sqlserver.php +++ b/laravel/database/query/grammars/sqlserver.php @@ -59,7 +59,7 @@ class SQLServer extends Grammar { // it to the query here if there is not an OFFSET present. if ($query->limit > 0 and $query->offset <= 0) { - $select .= 'TOP '.$query->limit.' '; + $select .= 'TOP '. (int) $query->limit.' '; } return $select.$this->columnize($query->selects);