'create' helper for BetweenPredicate

packaged · Jan 22, 2015 · ee7de73 · ee7de73
1 parent 8b64d29
commit ee7de73
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/src/Predicate/BetweenPredicate.php b/src/Predicate/BetweenPredicate.php
@@ -20,6 +20,24 @@ class BetweenPredicate implements IPredicate
    */
   protected $_field;
 
+  public static function create($field, $start, $end)
+  {
+    $predicate = new static;
+    $predicate->setField($field);
+
+    if(is_scalar($start))
+    {
+      $start = ValueExpression::create($start);
+    }
+    if(is_scalar($end))
+    {
+      $end = ValueExpression::create($end);
+    }
+
+    $predicate->setValues($start, $end);
+    return $predicate;
+  }
+
   public function setField($field)
   {
     $this->_field = is_scalar($field) ?
@@ -37,7 +55,7 @@ public function setValues(
   )
   {
     $this->_rangeStart = $start;
-    $this->_rangeEnd   = $end;
+    $this->_rangeEnd = $end;
     return $this;
   }
 

diff --git a/tests/Predicate/BetweenPredicateTest.php b/tests/Predicate/BetweenPredicateTest.php
@@ -41,6 +41,18 @@ public function testAssemble()
       'field BETWEEN "abc" AND "def"',
       QueryAssembler::stringify($predicate)
     );
+
+    $predicate = BetweenPredicate::create('field', 123, 456);
+    $this->assertEquals(
+      'field BETWEEN 123 AND 456',
+      QueryAssembler::stringify($predicate)
+    );
+
+    $predicate = BetweenPredicate::create('field', 'abc', 'def');
+    $this->assertEquals(
+      'field BETWEEN "abc" AND "def"',
+      QueryAssembler::stringify($predicate)
+    );
   }
 
   public function testGettersAndSetters()