WIP

Author: mikebronner

src/CachedBuilder.php

@@ -74,31 +74,27 @@ protected function getQueryColumns(array $columns) : string
 
     protected function getWhereClauses(array $wheres = []) : string
     {
-        $wheres = collect($wheres);
-
-        if ($wheres->isEmpty()) {
-            $wheres = collect($this->query->wheres);
-        }
-
-        return $wheres->reduce(function ($carry, $where) {
-            if (in_array($where['type'], ['Exists', 'Nested', 'NotExists'])) {
-                return '_' . strtolower($where['type']) . $this->getWhereClauses($where['query']->wheres);
-            }
+        return $this->getWheres($wheres)
+            ->reduce(function ($carry, $where) {
+                if (in_array($where['type'], ['Exists', 'Nested', 'NotExists'])) {
+                    return '_' . strtolower($where['type']) . $this->getWhereClauses($where['query']->wheres);
+                }
 
-            if ($where['type'] === 'Column') {
-                return "_{$where['boolean']}_{$where['first']}_{$where['operator']}_{$where['second']}";
-            }
+                if ($where['type'] === 'Column') {
+                    return "_{$where['boolean']}_{$where['first']}_{$where['operator']}_{$where['second']}";
+                }
 
-            if ($where['type'] === 'raw') {
-                return "_{$where['boolean']}_" . str_slug($where['sql']);
-            }
+                if ($where['type'] === 'raw') {
+                    return "_{$where['boolean']}_" . str_slug($where['sql']);
+                }
 
-            $value = array_get($where, 'value');
-            $value .= $this->getTypeClause($where);
-            $value .= $this->getValuesClause($where);
+                $value = array_get($where, 'value');
+                $value .= $this->getTypeClause($where);
+                $value .= $this->getValuesClause($where);
 
-            return "{$carry}-{$where['column']}_{$value}";
-        }) . '';
+                return "{$carry}-{$where['column']}_{$value}";
+            })
+            . '';
     }
 
     protected function getWithModels() : string
@@ -256,4 +252,15 @@ protected function getValuesClause($where)
             ? '_' . implode('_', $where['values'])
             : '';
     }
+
+    protected function getWheres(array $wheres) : Collection
+    {
+        $wheres = collect($wheres);
+
+        if ($wheres->isEmpty()) {
+            $wheres = collect($this->query->wheres);
+        }
+
+        return $wheres;
+    }
 }