Closes zendframework#5775

Merge branch 'hotfix/5775' * hotfix/5775: Added unit tests for Zend\Db\Sql's Predicate factory for notLike() CS Fixes Update Predicate.php
EvanDotPro · Feb 28, 2014 · 53c4d2f · 53c4d2f
2 parents 026e47b + 9cf3018
commit 53c4d2f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/library/Zend/Db/Sql/Predicate/Predicate.php b/library/Zend/Db/Sql/Predicate/Predicate.php
@@ -216,6 +216,24 @@ public function like($identifier, $like)
 
         return $this;
     }
+    /**
+     * Create "notLike" predicate
+     *
+     * Utilizes In predicate
+     *
+     * @param  string $identifier
+     * @param  string $notLike
+     * @return Predicate
+     */
+    public function notLike($identifier, $notLike)
+    {
+        $this->addPredicate(
+            new NotLike($identifier, $notLike),
+            ($this->nextPredicateCombineOperator) ? : $this->defaultCombination
+        );
+        $this->nextPredicateCombineOperator = null;
+        return $this;
+    }
 
     /**
      * Create an expression, with parameter placeholders

diff --git a/tests/ZendTest/Db/Sql/Predicate/PredicateTest.php b/tests/ZendTest/Db/Sql/Predicate/PredicateTest.php
@@ -88,6 +88,16 @@ public function testLikeCreatesLikePredicate()
         $this->assertContains(array('foo.bar', 'bar%'), $parts[0]);
     }
 
+    public function testNotLikeCreatesLikePredicate()
+    {
+        $predicate = new Predicate();
+        $predicate->notLike('foo.bar', 'bar%');
+        $parts = $predicate->getExpressionData();
+        $this->assertEquals(1, count($parts));
+        $this->assertContains('%1$s NOT LIKE %2$s', $parts[0]);
+        $this->assertContains(array('foo.bar', 'bar%'), $parts[0]);
+    }
+
     public function testLiteralCreatesLiteralPredicate()
     {
         $predicate = new Predicate();