Improve array of conditions support in DynamoDbQueryBuilder::where() (b…

…aopham#180)

src/DynamoDbQueryBuilder.php

@@ -211,8 +211,10 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
         // received when the method was called and pass it into the nested where.
         if (is_array($column)) {
             foreach ($column as $key => $value) {
-                return $this->where($key, '=', $value);
+                $this->where($key, '=', $value, $boolean);
             }
+
+            return $this;
         }
 
         // Here we will make some assumptions about the operator. If only 2 values are

tests/DynamoDbCompositeModelTest.php

@@ -573,13 +573,13 @@ public function testAfterKeyForQueryOperation()
             $query = $this->testModel->where('id', 'id')->where('id2', '>', '-1');
 
             $this->assertEquals('Query', $query->toDynamoDbQuery()->op);
-    
+
             do {
                 $items = $query->afterKey($afterKey)->limit(2)->all();
                 $paginationResult = $paginationResult->merge($items->pluck('id2'));
                 $afterKey = $getKey($items);
             } while ($afterKey);
-    
+
             $this->assertCount(10, $paginationResult);
             $paginationResult->each(function ($id) {
                 $this->assertGreaterThan('-1', $id);

tests/DynamoDbNonCompositeModelTest.php

@@ -909,7 +909,7 @@ public function testAfterKeyForQueryOperation()
             $this->assertEquals(10, $count);
         });
     }
- 
+
     public function testAfterKeyForScanOperation()
     {
         foreach (range(0, 9) as $i) {
@@ -919,18 +919,18 @@ public function testAfterKeyForScanOperation()
         $assert = function (callable $getKey) {
             $paginationResult = collect();
             $afterKey = null;
-    
+
             do {
                 $items = $this->testModel
                     ->afterKey($afterKey)
                     ->limit(2)->all();
                 $afterKey = $getKey($items);
                 $paginationResult = $paginationResult->merge($items->pluck('count'));
             } while ($afterKey);
-    
+
             $this->assertEquals(range(0, 9), $paginationResult->sort()->values()->toArray());
         };
- 
+
         $assert(function ($items) {
             return $items->lastKey();
         });
@@ -1156,6 +1156,28 @@ public function testQueryNestedAttributes()
         $this->assertEquals($item['id']['S'], $results->first()->id);
     }
 
+    public function testBuilderContainsAllWhereClausesWhenGivenArrayOfConditions()
+    {
+        /** @var array $conditions */
+        $conditions = [
+            "foo" => "bar",
+            "bin" => "baz"
+        ];
+
+        $builder = $this->getTestModel()->where($conditions);
+
+        /** @var array $conditionsFromBuilder */
+        $conditionsFromBuilder = [];
+
+        /** @var array $builderConditions */
+        foreach ($builder->wheres as $builderConditions) {
+            $conditionsFromBuilder[$builderConditions['column']] = $builderConditions['value'];
+        }
+
+        // Assert that the builder has the where-conditions we expect to see
+        $this->assertEquals($conditions, $conditionsFromBuilder);
+    }
+
     protected function assertRemoveAttributes($item)
     {
         $this->assertNull($item->name);