Add where OR statement support; which is technical dept at its start.

BowlOfSoup · Mar 26, 2019 · 5c89572 · 5c89572
1 parent e4887ca
commit 5c89572
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 4 deletions.
diff --git a/src/Builder/QueryBuilder.php b/src/Builder/QueryBuilder.php
@@ -106,6 +106,18 @@ public function where(string $where): self
         return $this;
     }
 
+    /**
+     * @param string $where
+     *
+     * @return \BowlOfSoup\CouchbaseAccessLayer\Builder\QueryBuilder
+     */
+    public function whereOr(string $where): self
+    {
+        $this->query->addWhereOr($where);
+
+        return $this;
+    }
+
     /**
      * @param string $orderBy
      * @param string|null $direction

diff --git a/src/Model/Query.php b/src/Model/Query.php
@@ -32,7 +32,10 @@ class Query
     private $useIndex;
 
     /** @var array */
-    private $where = [];
+    private $whereAnd = [];
+
+    /** @var array */
+    private $whereOr = [];
 
     /** @var array */
     private $orderBy = [];
@@ -108,7 +111,15 @@ public function setUseIndex(string $index)
      */
     public function addWhere(string $where)
     {
-        $this->where[] = $where;
+        $this->whereAnd[] = $where;
+    }
+
+    /**
+     * @param string $where
+     */
+    public function addWhereOr(string $where)
+    {
+        $this->whereOr[] = $where;
     }
 
     /**
@@ -194,8 +205,10 @@ public function build(): string
             $query .= sprintf('USE INDEX (%s USING GSI) ', $this->useIndex);
         }
 
-        if (!empty($this->where)) {
-            $query .= 'WHERE ' . implode(' AND ', $this->where);
+        if (!empty($this->whereAnd) || !empty($this->whereOr)) {
+            $whereOrStatement = !empty($this->whereOr) ? ' OR ' : '';
+
+            $query .= 'WHERE ' . implode(' AND ', $this->whereAnd) . $whereOrStatement . implode(' OR ', $this->whereOr);
         }
 
         if (!empty($this->groupBy)) {

diff --git a/tests/Builder/QueryBuilderTest.php b/tests/Builder/QueryBuilderTest.php
@@ -53,6 +53,48 @@ public function testGetQuery()
         ], $queryBuilder->getParameters());
     }
 
+    /**
+     * @throws \BowlOfSoup\CouchbaseAccessLayer\Exception\CouchbaseQueryException
+     */
+    public function testGetQueryWithWhereOr()
+    {
+        $queryBuilder = new QueryBuilder('default_bucket');
+
+        $queryBuilder
+            ->where('someField = $someField')
+            ->whereOr('`key` IN [\'foo\', \'bar\']');
+
+        $queryBuilder->setParameters([
+            'someField' => '12346782',
+            'anotherValue' => 'ThisIsADocument',
+            'type' => 'SomeDifferentTypeOfDocument',
+        ]);
+
+        $queryBuilder
+            ->where('data.foo > $dataFoo')
+            ->setParameter('dataFoo', 'bar');
+
+        $queryBuilder
+            ->groupBy('someField')
+            ->orderBy('data.someOrderingField', Query::ORDER_DESC)
+            ->limit(10)
+            ->offset(5);
+
+        $queryBuilder->select('someField');
+        $queryBuilder->selectMultiple(['foo', 'COUNT(bar) AS bar_counted']);
+
+        $this->assertSame(
+            'SELECT someField, foo, COUNT(bar) AS bar_counted FROM `default_bucket` WHERE someField = $someField AND data.foo > $dataFoo OR `key` IN [\'foo\', \'bar\'] GROUP BY someField ORDER BY data.someOrderingField DESC LIMIT 10 OFFSET 5',
+            $queryBuilder->getQuery()
+        );
+        $this->assertSame([
+            'someField' => '12346782',
+            'anotherValue' => 'ThisIsADocument',
+            'type' => 'SomeDifferentTypeOfDocument',
+            'dataFoo' => 'bar',
+        ], $queryBuilder->getParameters());
+    }
+
     /**
      * @throws \BowlOfSoup\CouchbaseAccessLayer\Exception\CouchbaseQueryException
      */