Merge pull request #17 from BirdDGP/where-in-fix

Add whereKey to extend on Eloquent Builder

Author: BirdDGP

src/Database/EloquentBuilder.php

@@ -60,6 +60,20 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function whereKey($id)
+    {
+        if (is_array($id) || $id instanceof Arrayable) {
+            $this->whereIn($this->model->getQualifiedKeyName(), $id);
+
+            return $this;
+        }
+
+        return parent::whereKey($id);
+    }
+
     /**
      * {@inheritdoc}
      */

tests/Integration/MutatorTest.php

@@ -88,6 +88,18 @@ public function test_find()
         $this->assertEquals($id, $p->id);
     }
 
+    public function test_array_of_find()
+    {
+        $id = Uuid::uuid1()->toString();
+        $model = (new TestModel())->create(['id' => $id, 'name' => 'Name A']);
+        $id2 = Uuid::uuid1()->toString();
+        $model = (new TestModel())->create(['id' => $id2, 'name' => 'Name B']);
+        $p = $model->find([$id, $id2]);
+        $this->assertEquals(2, $p->count());
+        $this->assertEquals($id, $p[0]->id);
+        $this->assertEquals($id2, $p[1]->id);
+    }
+
     public function test_non_mutated_columns()
     {
         $id = Uuid::uuid1()->toString();
@@ -111,6 +123,18 @@ public function test_where_in()
         $this->assertEquals(2, $p->count());
     }
 
+    public function test_where_key()
+    {
+        $id = Uuid::uuid1()->toString();
+        $id2 = Uuid::uuid1()->toString();
+        $model = (new TestModel())->create(['id' => $id, 'name' => 'A chair']);
+        $model2 = (new TestModel())->create(['id' => $id2, 'name' => 'A table']);
+        $p = $model->whereKey([$id, $id2])->get();
+        $this->assertEquals(2, $p->count());
+        $this->assertEquals($id, $p[0]->id);
+        $this->assertEquals($id2, $p[1]->id);
+    }
+
     public function test_update()
     {
         $id = Uuid::uuid1()->toString();