Merge branch 'hotfix/5857' into develop

Forward port zendframework/zendframework#5857
zendframework · Apr 14, 2014 · 63af384 · 63af384
3 parents f375652 + 4407fb8 + 0882e33
commit 63af384
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/src/Db/AbstractDb.php b/src/Db/AbstractDb.php
@@ -189,6 +189,7 @@ public function getExclude()
     public function setExclude($exclude)
     {
         $this->exclude = $exclude;
+        $this->select  = null;
         return $this;
     }
 
@@ -210,7 +211,8 @@ public function getField()
      */
     public function setField($field)
     {
-        $this->field = (string) $field;
+        $this->field  = (string) $field;
+        $this->select = null;
         return $this;
     }
 
@@ -232,7 +234,8 @@ public function getTable()
      */
     public function setTable($table)
     {
-        $this->table = (string) $table;
+        $this->table  = (string) $table;
+        $this->select = null;
         return $this;
     }
 
@@ -255,6 +258,7 @@ public function getSchema()
     public function setSchema($schema)
     {
         $this->schema = $schema;
+        $this->select = null;
         return $this;
     }
 

diff --git a/test/Db/RecordExistsTest.php b/test/Db/RecordExistsTest.php
@@ -273,4 +273,39 @@ public function testGetSelect()
         $this->assertNull($parameters['where1']);
         $this->assertEquals($parameters['where2'], 'bar');
     }
+
+    /**
+     * @cover Zend\Validator\Db\RecordExists::getSelect
+     * @group ZF2-4521
+     */
+    public function testGetSelectWithSameValidatorTwice()
+    {
+        $validator = new RecordExists(
+            array(
+                'table' => 'users',
+                'schema' => 'my'
+            ),
+            'field1',
+            array(
+                'field' => 'foo',
+                'value' => 'bar'
+            ),
+            $this->getMockHasResult()
+        );
+        $select = $validator->getSelect();
+        $this->assertInstanceOf('Zend\Db\Sql\Select', $select);
+        $this->assertEquals('SELECT "my"."users"."field1" AS "field1" FROM "my"."users" WHERE "field1" = \'\' AND "foo" != \'bar\'', $select->getSqlString(new TrustingSql92Platform()));
+
+        // same validator instance with changing properties
+        $validator->setTable('othertable');
+        $validator->setSchema('otherschema');
+        $validator->setField('fieldother');
+        $validator->setExclude(array(
+            'field' => 'fieldexclude',
+            'value' => 'fieldvalueexclude',
+        ));
+        $select = $validator->getSelect();
+        $this->assertInstanceOf('Zend\Db\Sql\Select', $select);
+        $this->assertEquals('SELECT "otherschema"."othertable"."fieldother" AS "fieldother" FROM "otherschema"."othertable" WHERE "fieldother" = \'\' AND "fieldexclude" != \'fieldvalueexclude\'', $select->getSqlString(new TrustingSql92Platform()));
+    }
 }