LikePredicate only supports specific Expression types. Add NotLikePre…

…dicate
packaged · Jan 6, 2015 · 28bcbfd · 28bcbfd
1 parent 636d908
commit 28bcbfd
Show file tree

Hide file tree

Showing 11 changed files with 168 additions and 16 deletions.
diff --git a/src/Expression/Like/ContainsExpression.php b/src/Expression/Like/ContainsExpression.php
@@ -0,0 +1,10 @@
+<?php
+namespace Packaged\QueryBuilder\Expression\Like;
+
+class ContainsExpression extends CustomLikeExpression
+{
+  public function getValue()
+  {
+    return '%' . parent::getValue() . '%';
+  }
+}
diff --git a/src/Expression/Like/CustomLikeExpression.php b/src/Expression/Like/CustomLikeExpression.php
@@ -0,0 +1,9 @@
+<?php
+namespace Packaged\QueryBuilder\Expression\Like;
+
+use Packaged\QueryBuilder\Expression\StringExpression;
+
+class CustomLikeExpression extends StringExpression
+{
+
+}
diff --git a/src/Expression/Like/EndsWithExpression.php b/src/Expression/Like/EndsWithExpression.php
@@ -0,0 +1,10 @@
+<?php
+namespace Packaged\QueryBuilder\Expression\Like;
+
+class EndsWithExpression extends CustomLikeExpression
+{
+  public function getValue()
+  {
+    return parent::getValue() . '%';
+  }
+}
diff --git a/src/Expression/Like/StartsWithExpression.php b/src/Expression/Like/StartsWithExpression.php
@@ -0,0 +1,10 @@
+<?php
+namespace Packaged\QueryBuilder\Expression\Like;
+
+class StartsWithExpression extends CustomLikeExpression
+{
+  public function getValue()
+  {
+    return '%' . parent::getValue();
+  }
+}
diff --git a/src/Predicate/LikePredicate.php b/src/Predicate/LikePredicate.php
@@ -1,6 +1,9 @@
 <?php
 namespace Packaged\QueryBuilder\Predicate;
 
+use Packaged\QueryBuilder\Expression\IExpression;
+use Packaged\QueryBuilder\Expression\Like\CustomLikeExpression;
+
 class LikePredicate extends AbstractOperatorPredicate
 {
   /**
@@ -11,4 +14,14 @@ public function getOperator()
   {
     return 'LIKE';
   }
+
+  public function setExpression(IExpression $value)
+  {
+    if(!($value instanceof CustomLikeExpression))
+    {
+      throw new \Exception('Invalid Expression Type');
+    }
+    $this->_value = $value;
+    return $this;
+  }
 }
diff --git a/src/Predicate/NotLikePredicate.php b/src/Predicate/NotLikePredicate.php
@@ -0,0 +1,10 @@
+<?php
+namespace Packaged\QueryBuilder\Predicate;
+
+class NotLikePredicate extends LikePredicate
+{
+  public function getOperator()
+  {
+    return 'NOT LIKE';
+  }
+}
diff --git a/tests/Predicate/LikePredicateTest.php b/tests/Predicate/LikePredicateTest.php
@@ -2,9 +2,12 @@
 namespace Packaged\Tests\QueryBuilder\Predicate;
 
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
-use Packaged\QueryBuilder\Predicate\LikePredicate;
-use Packaged\QueryBuilder\Expression\NumericExpression;
+use Packaged\QueryBuilder\Expression\Like\ContainsExpression;
+use Packaged\QueryBuilder\Expression\Like\CustomLikeExpression;
+use Packaged\QueryBuilder\Expression\Like\EndsWithExpression;
+use Packaged\QueryBuilder\Expression\Like\StartsWithExpression;
 use Packaged\QueryBuilder\Expression\StringExpression;
+use Packaged\QueryBuilder\Predicate\LikePredicate;
 
 class LikePredicateTest extends \PHPUnit_Framework_TestCase
 {
@@ -16,34 +19,51 @@ public function testAssemble()
       'field LIKE NULL',
       QueryAssembler::stringify($predicate)
     );
-    $predicate->setExpression((new NumericExpression())->setValue(1));
-    $this->assertEquals('field LIKE 1', QueryAssembler::stringify($predicate));
-    $predicate->setExpression((new NumericExpression())->setValue('1'));
-    $this->assertEquals('field LIKE 1', QueryAssembler::stringify($predicate));
-    $predicate->setExpression((new StringExpression())->setValue('abc'));
+    $predicate->setExpression(CustomLikeExpression::create(1));
+    $this->assertEquals(
+      'field LIKE "1"',
+      QueryAssembler::stringify($predicate)
+    );
+    $predicate->setExpression(CustomLikeExpression::create('1'));
+    $this->assertEquals(
+      'field LIKE "1"',
+      QueryAssembler::stringify($predicate)
+    );
+    $predicate->setExpression(CustomLikeExpression::create('abc'));
     $this->assertEquals(
       'field LIKE "abc"',
       QueryAssembler::stringify($predicate)
     );
-    $predicate->setExpression((new StringExpression())->setValue('abc%'));
+    $predicate->setExpression(EndsWithExpression::create('abc'));
     $this->assertEquals(
       'field LIKE "abc%"',
       QueryAssembler::stringify($predicate)
     );
-    $predicate->setExpression((new StringExpression())->setValue('%abc%'));
+    $predicate->setExpression(ContainsExpression::create('abc'));
     $this->assertEquals(
       'field LIKE "%abc%"',
       QueryAssembler::stringify($predicate)
     );
-    $predicate->setExpression((new StringExpression())->setValue('%abc'));
+    $predicate->setExpression(StartsWithExpression::create('abc'));
     $this->assertEquals(
       'field LIKE "%abc"',
       QueryAssembler::stringify($predicate)
     );
-    $predicate->setExpression((new StringExpression())->setValue('a%bc'));
+    $predicate->setExpression(CustomLikeExpression::create('a%bc'));
     $this->assertEquals(
       'field LIKE "a%bc"',
       QueryAssembler::stringify($predicate)
     );
   }
+
+  /**
+   * @expectedException \Exception
+   * @expectedExceptionMessage Invalid Expression Type
+   */
+  public function testInvalidExpression()
+  {
+    $predicate = new LikePredicate();
+    $predicate->setField('field');
+    $predicate->setExpression(StringExpression::create('a%bc'));
+  }
 }
diff --git a/tests/Predicate/NotLikePredicateTest.php b/tests/Predicate/NotLikePredicateTest.php
@@ -0,0 +1,69 @@
+<?php
+namespace Packaged\Tests\QueryBuilder\Predicate;
+
+use Packaged\QueryBuilder\Assembler\QueryAssembler;
+use Packaged\QueryBuilder\Expression\Like\ContainsExpression;
+use Packaged\QueryBuilder\Expression\Like\CustomLikeExpression;
+use Packaged\QueryBuilder\Expression\Like\EndsWithExpression;
+use Packaged\QueryBuilder\Expression\Like\StartsWithExpression;
+use Packaged\QueryBuilder\Expression\StringExpression;
+use Packaged\QueryBuilder\Predicate\NotLikePredicate;
+
+class NotLikePredicateTest extends \PHPUnit_Framework_TestCase
+{
+  public function testAssemble()
+  {
+    $predicate = new NotLikePredicate();
+    $predicate->setField('field');
+    $this->assertEquals(
+      'field NOT LIKE NULL',
+      QueryAssembler::stringify($predicate)
+    );
+    $predicate->setExpression(CustomLikeExpression::create(1));
+    $this->assertEquals(
+      'field NOT LIKE "1"',
+      QueryAssembler::stringify($predicate)
+    );
+    $predicate->setExpression(CustomLikeExpression::create('1'));
+    $this->assertEquals(
+      'field NOT LIKE "1"',
+      QueryAssembler::stringify($predicate)
+    );
+    $predicate->setExpression(CustomLikeExpression::create('abc'));
+    $this->assertEquals(
+      'field NOT LIKE "abc"',
+      QueryAssembler::stringify($predicate)
+    );
+    $predicate->setExpression(EndsWithExpression::create('abc'));
+    $this->assertEquals(
+      'field NOT LIKE "abc%"',
+      QueryAssembler::stringify($predicate)
+    );
+    $predicate->setExpression(ContainsExpression::create('abc'));
+    $this->assertEquals(
+      'field NOT LIKE "%abc%"',
+      QueryAssembler::stringify($predicate)
+    );
+    $predicate->setExpression(StartsWithExpression::create('abc'));
+    $this->assertEquals(
+      'field NOT LIKE "%abc"',
+      QueryAssembler::stringify($predicate)
+    );
+    $predicate->setExpression(CustomLikeExpression::create('a%bc'));
+    $this->assertEquals(
+      'field NOT LIKE "a%bc"',
+      QueryAssembler::stringify($predicate)
+    );
+  }
+
+  /**
+   * @expectedException \Exception
+   * @expectedExceptionMessage Invalid Expression Type
+   */
+  public function testInvalidExpression()
+  {
+    $predicate = new NotLikePredicate();
+    $predicate->setField('field');
+    $predicate->setExpression(StringExpression::create('a%bc'));
+  }
+}
diff --git a/tests/Statement/DeleteStatementTest.php b/tests/Statement/DeleteStatementTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\Clause\DeleteClause;
 use Packaged\QueryBuilder\Clause\WhereClause;
-use Packaged\QueryBuilder\Expression\StringExpression;
+use Packaged\QueryBuilder\Expression\Like\EndsWithExpression;
 use Packaged\QueryBuilder\Predicate\LikePredicate;
 use Packaged\QueryBuilder\Predicate\NotEqualPredicate;
 use Packaged\QueryBuilder\Statement\DeleteStatement;
@@ -33,7 +33,7 @@ public function testAssemble()
 
     $where->addPredicate(
       (new LikePredicate())->setField('name')->setExpression(
-        (new StringExpression())->setValue('Joh%')
+        EndsWithExpression::create('Joh')
       )
     );
     $this->assertEquals(

diff --git a/tests/Statement/QueryStatementTest.php b/tests/Statement/QueryStatementTest.php
@@ -10,8 +10,8 @@
 use Packaged\QueryBuilder\Clause\SelectClause;
 use Packaged\QueryBuilder\Clause\WhereClause;
 use Packaged\QueryBuilder\Expression\FieldExpression;
+use Packaged\QueryBuilder\Expression\Like\EndsWithExpression;
 use Packaged\QueryBuilder\Expression\NumericExpression;
-use Packaged\QueryBuilder\Expression\StringExpression;
 use Packaged\QueryBuilder\Predicate\LessThanPredicate;
 use Packaged\QueryBuilder\Predicate\LikePredicate;
 use Packaged\QueryBuilder\Predicate\NotEqualPredicate;
@@ -47,7 +47,7 @@ public function testAssemble()
 
     $where->addPredicate(
       (new LikePredicate())->setField('name')->setExpression(
-        (new StringExpression())->setValue('Joh%')
+        EndsWithExpression::create('Joh')
       )
     );
     $this->assertEquals(

diff --git a/tests/Statement/UpdateStatementTest.php b/tests/Statement/UpdateStatementTest.php
@@ -5,6 +5,7 @@
 use Packaged\QueryBuilder\Clause\SetClause;
 use Packaged\QueryBuilder\Clause\UpdateClause;
 use Packaged\QueryBuilder\Clause\WhereClause;
+use Packaged\QueryBuilder\Expression\Like\EndsWithExpression;
 use Packaged\QueryBuilder\Expression\StringExpression;
 use Packaged\QueryBuilder\Expression\TableExpression;
 use Packaged\QueryBuilder\Predicate\EqualPredicate;
@@ -41,7 +42,7 @@ public function testAssemble()
 
     $where->addPredicate(
       (new LikePredicate())->setField('name')->setExpression(
-        (new StringExpression())->setValue('Joh%')
+        EndsWithExpression::create('Joh')
       )
     );
     $this->assertEquals(