Fix queries with whereIn and empty arrays

JoostK · JoostK · commit 52a0b5809da0 · 2015-01-12T19:49:20.000+01:00
diff --git a/src/Illuminate/Database/Query/Grammars/Grammar.php b/src/Illuminate/Database/Query/Grammars/Grammar.php
@@ -306,6 +306,8 @@ protected function whereNotExists(Builder $query, $where)
 	 */
 	protected function whereIn(Builder $query, $where)
 	{
+		if (empty($where['values'])) return '0';
+
 		$values = $this->parameterize($where['values']);
 
 		return $this->wrap($where['column']).' in ('.$values.')';
@@ -320,6 +322,8 @@ protected function whereIn(Builder $query, $where)
 	 */
 	protected function whereNotIn(Builder $query, $where)
 	{
+		if (empty($where['values'])) return '1';
+
 		$values = $this->parameterize($where['values']);
 
 		return $this->wrap($where['column']).' not in ('.$values.')';
@@ -376,7 +380,7 @@ protected function whereNotNull(Builder $query, $where)
 	{
 		return $this->wrap($where['column']).' is not null';
 	}
-	
+
 	/**
 	 * Compile a "where date" clause.
 	 *
@@ -388,7 +392,7 @@ protected function whereDate(Builder $query, $where)
 	{
 		return $this->dateBasedWhere('date', $query, $where);
 	}
-	
+
 	/**
 	 * Compile a "where day" clause.
 	 *
diff --git a/tests/Database/DatabaseQueryBuilderTest.php b/tests/Database/DatabaseQueryBuilderTest.php
@@ -343,6 +343,34 @@ public function testBasicWhereNotIns()
 	}
 
 
+	public function testEmptyWhereIns()
+	{
+		$builder = $this->getBuilder();
+		$builder->select('*')->from('users')->whereIn('id', array());
+		$this->assertEquals('select * from "users" where 0', $builder->toSql());
+		$this->assertEquals(array(), $builder->getBindings());
+
+		$builder = $this->getBuilder();
+		$builder->select('*')->from('users')->where('id', '=', 1)->orWhereIn('id', array());
+		$this->assertEquals('select * from "users" where "id" = ? or 0', $builder->toSql());
+		$this->assertEquals(array(0 => 1), $builder->getBindings());
+	}
+
+
+	public function testEmptyWhereNotIns()
+	{
+		$builder = $this->getBuilder();
+		$builder->select('*')->from('users')->whereNotIn('id', array());
+		$this->assertEquals('select * from "users" where 1', $builder->toSql());
+		$this->assertEquals(array(), $builder->getBindings());
+
+		$builder = $this->getBuilder();
+		$builder->select('*')->from('users')->where('id', '=', 1)->orWhereNotIn('id', array());
+		$this->assertEquals('select * from "users" where "id" = ? or 1', $builder->toSql());
+		$this->assertEquals(array(0 => 1), $builder->getBindings());
+	}
+
+
 	public function testUnions()
 	{
 		$builder = $this->getBuilder();

Original file line number	Diff line number	Diff line change
`@@ -306,6 +306,8 @@ protected function whereNotExists(Builder $query, $where)`
`306`	`306`	`*/`
`307`	`307`	`protected function whereIn(Builder $query, $where)`
`308`	`308`	`{`
	`309`	`+ if (empty($where['values'])) return '0';`
	`310`	`+`
`309`	`311`	`$values = $this->parameterize($where['values']);`
`310`	`312`
`311`	`313`	`return $this->wrap($where['column']).' in ('.$values.')';`
`@@ -320,6 +322,8 @@ protected function whereIn(Builder $query, $where)`
`320`	`322`	`*/`
`321`	`323`	`protected function whereNotIn(Builder $query, $where)`
`322`	`324`	`{`
	`325`	`+ if (empty($where['values'])) return '1';`
	`326`	`+`
`323`	`327`	`$values = $this->parameterize($where['values']);`
`324`	`328`
`325`	`329`	`return $this->wrap($where['column']).' not in ('.$values.')';`
`@@ -376,7 +380,7 @@ protected function whereNotNull(Builder $query, $where)`
`376`	`380`	`{`
`377`	`381`	`return $this->wrap($where['column']).' is not null';`
`378`	`382`	`}`
`379`		`-`
	`383`	`+`
`380`	`384`	`/**`
`381`	`385`	`* Compile a "where date" clause.`
`382`	`386`	`*`
`@@ -388,7 +392,7 @@ protected function whereDate(Builder $query, $where)`
`388`	`392`	`{`
`389`	`393`	`return $this->dateBasedWhere('date', $query, $where);`
`390`	`394`	`}`
`391`		`-`
	`395`	`+`
`392`	`396`	`/**`
`393`	`397`	`* Compile a "where day" clause.`
`394`	`398`	`*`