Fixed search criteria. Its conditions must be within parentheses

anavel · Sep 19, 2016 · 073799d · 073799d
1 parent d88c3d7
commit 073799d
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/src/Repository/Criteria/SearchCriteria.php b/src/Repository/Criteria/SearchCriteria.php
@@ -17,21 +17,23 @@ public function __construct(array $columns, $queryString)
 
     public function apply($model, Repository $repository)
     {
-        $firstColumn = array_shift($this->columns);
+        $query = $model->where(function ($query) use ($repository) {
+            $firstColumn = array_shift($this->columns);
 
-        if (strpos($firstColumn, '.')) {
-            $query = $this->setRelationFieldCondition($model, $firstColumn, false);
-        } else {
-            $query = $model->where($firstColumn, 'LIKE', '%'.$this->queryString.'%');
-        }
-
-        foreach ($this->columns as $column) {
-            if (strpos($column, '.')) {
-                $query = $this->setRelationFieldCondition($query, $column);
+            if (strpos($firstColumn, '.')) {
+                $query = $this->setRelationFieldCondition($query, $firstColumn, false);
             } else {
-                $query->orWhere($column, 'LIKE', '%'.$this->queryString.'%');
+                $query = $query->where($firstColumn, 'LIKE', '%'.$this->queryString.'%');
             }
-        }
+
+            foreach ($this->columns as $column) {
+                if (strpos($column, '.')) {
+                    $query = $this->setRelationFieldCondition($query, $column);
+                } else {
+                    $query->orWhere($column, 'LIKE', '%'.$this->queryString.'%');
+                }
+            }
+        });
 
         return $query;
     }