Predicates are now added in the foreach loop of the where function

Test created to test this new scenario
lookatitude · Jul 26, 2012 · 9920e34 · 9920e34
1 parent 40d6d43
commit 9920e34
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/library/Zend/Db/Sql/Update.php b/library/Zend/Db/Sql/Update.php
@@ -140,7 +140,11 @@ public function where($predicate, $combination = Predicate\PredicateSet::OP_AND)
                     } else {
                         $predicate = new Predicate\Expression($pvalue);
                     }
+
+                    $this->where->addPredicate($predicate, $combination);
                 }
+
+                return $this;
             }
             $this->where->addPredicate($predicate, $combination);
         }

diff --git a/tests/Zend/Db/Sql/UpdateTest.php b/tests/Zend/Db/Sql/UpdateTest.php
@@ -93,6 +93,15 @@ public function testWhere()
         });
     }
 
+    public function testPassingMultipleKeyValueInWhereClause()
+    {
+        $update = clone $this->update;
+        $update->table('table');
+        $update->set(array('fld1' => 'val1'));
+        $update->where(array('id1' => 'val1', 'id2' => 'val2'));
+        $this->assertEquals('UPDATE "table" SET "fld1" = \'val1\' WHERE "id1" = \'val1\' AND "id2" = \'val2\'', $update->getSqlString());
+    }
+
     /**
      * @covers Zend\Db\Sql\Update::prepareStatement
      */