[5.3] Fixes #15077 - QueryBuilder whereIn does not consider raw expre…

…ssions (#15078) * Fixes #15077 - QueryBuilder whereIn does not consider raw expressions * style ci changes * style ci changes
laravel · Aug 27, 2016 · 15de9a1 · 15de9a1
1 parent ed05e5d
commit 15de9a1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php
@@ -909,7 +909,11 @@ public function whereIn($column, $values, $boolean = 'and', $not = false)
 
         $this->wheres[] = compact('type', 'column', 'values', 'boolean');
 
-        $this->addBinding($values, 'where');
+        foreach ($values as $value) {
+            if (! $value instanceof Expression) {
+                $this->addBinding($value, 'where');
+            }
+        }
 
         return $this;
     }

diff --git a/tests/Database/DatabaseQueryBuilderTest.php b/tests/Database/DatabaseQueryBuilderTest.php
@@ -344,6 +344,18 @@ public function testBasicWhereNotIns()
         $this->assertEquals([0 => 1, 1 => 1, 2 => 2, 3 => 3], $builder->getBindings());
     }
 
+    public function testRawWhereIns()
+    {
+        $builder = $this->getBuilder();
+        $builder->select('*')->from('users')->whereIn('id', [new Raw(1)]);
+        $this->assertEquals('select * from "users" where "id" in (1)', $builder->toSql());
+
+        $builder = $this->getBuilder();
+        $builder->select('*')->from('users')->where('id', '=', 1)->orWhereIn('id', [new Raw(1)]);
+        $this->assertEquals('select * from "users" where "id" = ? or "id" in (1)', $builder->toSql());
+        $this->assertEquals([0 => 1], $builder->getBindings());
+    }
+
     public function testEmptyWhereIns()
     {
         $builder = $this->getBuilder();