Merge branch 'hotfix/ZF2-418' of git://github.com/postalservice14/zf2…

… into postalservice14-hotfix/ZF2-418
hinikato · Aug 1, 2012 · 47ba77b · 47ba77b
2 parents e058886 + 225aad1
commit 47ba77b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/library/Zend/Db/Sql/Update.php b/library/Zend/Db/Sql/Update.php
@@ -124,6 +124,10 @@ public function set(array $values, $flag = self::VALUES_SET)
      */
     public function where($predicate, $combination = Predicate\PredicateSet::OP_AND)
     {
+        if (is_null($predicate)) {
+            throw new \Zend\Db\Sql\Exception\InvalidArgumentException('Predicate cannot be null');
+        }
+
         if ($predicate instanceof Where) {
             $this->where = $predicate;
         } elseif ($predicate instanceof \Closure) {

diff --git a/library/Zend/Db/TableGateway/AbstractTableGateway.php b/library/Zend/Db/TableGateway/AbstractTableGateway.php
@@ -314,7 +314,7 @@ public function update($set, $where = null)
         $sql = $this->sql;
         $update = $sql->update();
         $update->set($set);
-        $update->where($where);
+        if (!is_null($where)) $update->where($where);
         return $this->executeUpdate($update);
     }
 

diff --git a/tests/Zend/Db/TableGateway/AbstractTableGatewayTest.php b/tests/Zend/Db/TableGateway/AbstractTableGatewayTest.php
@@ -204,6 +204,19 @@ public function testUpdate()
         $this->assertEquals(5, $affectedRows);
     }
 
+    /**
+     * @covers Zend\Db\TableGateway\AbstractTableGateway::update
+     * @covers Zend\Db\TableGateway\AbstractTableGateway::updateWith
+     * @covers Zend\Db\TableGateway\AbstractTableGateway::executeUpdate
+     */
+    public function testUpdateWithNoCriteria()
+    {
+        $mockUpdate = $this->mockSql->update();
+
+        $affectedRows = $this->table->update(array('foo' => 'bar'));
+        $this->assertEquals(5, $affectedRows);
+    }
+
     /**
      * @covers Zend\Db\TableGateway\AbstractTableGateway::delete
      * @covers Zend\Db\TableGateway\AbstractTableGateway::deleteWith