Merge pull request #175 from Maras0830/master

Allow search input '' or null.
nicolaslopezj · Jul 9, 2018 · ca3630e · ca3630e
2 parents 813a860 + ff6c5ef
commit ca3630e
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/SearchableTrait.php b/src/SearchableTrait.php
@@ -75,7 +75,9 @@ public function scopeSearchRestricted(Builder $q, $search, $restriction, $thresh
 
             foreach ($queries as $select)
             {
-                $selects[] = $select;
+                if (!empty($select)) {
+                    $selects[] = $select;
+                }
             }
         }
 
@@ -86,7 +88,9 @@ public function scopeSearchRestricted(Builder $q, $search, $restriction, $thresh
             $threshold = $relevance_count / 4;
         }
 
-        $this->filterQueryWithRelevance($query, $selects, $threshold);
+        if (!empty($selects)) {
+            $this->filterQueryWithRelevance($query, $selects, $threshold);
+        }
 
         $this->makeGroupBy($query);
 
@@ -220,7 +224,9 @@ protected function makeGroupBy(Builder $query)
      */
     protected function addSelectsToQuery(Builder $query, array $selects)
     {
-        $query->selectRaw('max(' . implode(' + ', $selects) . ') as relevance', $this->search_bindings);
+        if (!empty($selects)) {
+            $query->selectRaw('max(' . implode(' + ', $selects) . ') as relevance', $this->search_bindings);
+        }
     }
 
     /**
@@ -333,3 +339,4 @@ protected function mergeQueries(Builder $clone, Builder $original) {
         $original->withoutGlobalScopes()->setBindings($mergedBindings);
     }
 }
+