Merge pull request laravel#3017 from KaneCohen/db-offset

taylorotwell · taylorotwell · commit 66ab8a72badd · 2013-12-27T11:38:18.000-08:00
Fix DB offset method. Can not be negative.
diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php
@@ -954,7 +954,7 @@ public function orderByRaw($sql, $bindings = array())
 	 */
 	public function offset($value)
 	{
-		$this->offset = $value;
+		$this->offset = max(0, $value);
 
 		return $this;
 	}
diff --git a/tests/Database/DatabaseQueryBuilderTest.php b/tests/Database/DatabaseQueryBuilderTest.php
@@ -347,9 +347,17 @@ public function testLimitsAndOffsets()
 		$builder->select('*')->from('users')->skip(5)->take(10);
 		$this->assertEquals('select * from "users" limit 10 offset 5', $builder->toSql());
 
+		$builder = $this->getBuilder();
+		$builder->select('*')->from('users')->skip(-5)->take(10);
+		$this->assertEquals('select * from "users" limit 10 offset 0', $builder->toSql());
+
 		$builder = $this->getBuilder();
 		$builder->select('*')->from('users')->forPage(2, 15);
 		$this->assertEquals('select * from "users" limit 15 offset 15', $builder->toSql());
+
+		$builder = $this->getBuilder();
+		$builder->select('*')->from('users')->forPage(-2, 15);
+		$this->assertEquals('select * from "users" limit 15 offset 0', $builder->toSql());
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -954,7 +954,7 @@ public function orderByRaw($sql, $bindings = array())`
`954`	`954`	`*/`
`955`	`955`	`public function offset($value)`
`956`	`956`	`{`
`957`		`- $this->offset = $value;`
	`957`	`+ $this->offset = max(0, $value);`
`958`	`958`
`959`	`959`	`return $this;`
`960`	`960`	`}`