Fix parsing of between clause, bring tests to green

Author: mikebronner

src/CacheKey.php

@@ -111,30 +111,40 @@ protected function getValuesClause(array $where = null) : string
         }
 
         $values = $this->getValuesFromWhere($where);
-        $values = $this->getValuesFromBindings($values);
+        $values = $this->getValuesFromBindings($where, $values);
+
+
 
         return "_" . $values;
     }
 
     protected function getValuesFromWhere(array $where) : string
     {
-        return is_array(array_get($where, "values"))
-            ? implode("_", $where["values"])
-            : "";
+        if (is_array(array_get($where, "values"))) {
+            return implode("_", $where["values"]);
+        }
+
+        return array_get($where, "value", "");
     }
 
-    protected function getValuesFromBindings(string $values) : string
+    protected function getValuesFromBindings(array $where, string $values) : string
     {
-        if (! $values && $this->query->bindings["where"] ?? false) {
+        if (! $values && ($this->query->bindings["where"] ?? false)) {
             $values = $this->query->bindings["where"][$this->currentBinding];
+            $this->currentBinding++;
+
+            if ($where["type"] === "between") {
+                $values .= "_" . $this->query->bindings["where"][$this->currentBinding];
+                $this->currentBinding++;
+            }
         }
 
-        return $values;
+        return $values ?: "";
     }
 
     protected function getWhereClauses(array $wheres = []) : string
     {
-        $whereClause = $this->getWheres($wheres)
+        return "" . $this->getWheres($wheres)
             ->reduce(function ($carry, $where) {
                 $value = $carry;
                 $value .= $this->getNestedClauses($where);
@@ -143,10 +153,7 @@ protected function getWhereClauses(array $wheres = []) : string
                 $value .= $this->getOtherClauses($where, $carry);
 
                 return $value;
-            })
-            . "";
-
-        return $whereClause;
+            });
     }
 
     protected function getNestedClauses(array $where) : string
@@ -157,7 +164,7 @@ protected function getNestedClauses(array $where) : string
 
         $this->currentBinding++;
 
-        return "_" . strtolower($where["type"]) . $this->getWhereClauses($where["query"]->wheres);
+        return "-" . strtolower($where["type"]) . $this->getWhereClauses($where["query"]->wheres);
     }
 
     protected function getColumnClauses(array $where) : string
@@ -168,7 +175,7 @@ protected function getColumnClauses(array $where) : string
 
         $this->currentBinding++;
 
-        return "_{$where["boolean"]}_{$where["first"]}_{$where["operator"]}_{$where["second"]}";
+        return "-{$where["boolean"]}_{$where["first"]}_{$where["operator"]}_{$where["second"]}";
     }
 
     protected function getRawClauses(array $where) : string
@@ -192,7 +199,7 @@ protected function getRawClauses(array $where) : string
             $clause .= "_" . $lastPart;
         }
 
-        return str_replace(" ", "_", $clause);
+        return "-" . str_replace(" ", "_", $clause);
     }
 
     protected function getOtherClauses(array $where, string $carry = null) : string
@@ -203,9 +210,8 @@ protected function getOtherClauses(array $where, string $carry = null) : string
 
         $value = $this->getTypeClause($where);
         $value .= $this->getValuesClause($where);
-        $this->currentBinding++;
 
-        return "{$where["column"]}_{$value}";
+        return "-{$where["column"]}_{$value}";
     }
 
     protected function getWheres(array $wheres) : Collection

tests/Integration/CachedBuilder/WhereRawTest.php

@@ -37,7 +37,6 @@ public function testRawWhereClauseParsing()
         $this->assertTrue($liveResults->diffKeys($cachedResults)->isEmpty());
     }
 
-    /** @group test */
     public function testWhereRawWithQueryParameters()
     {
         $authorName = (new Author)->first()->name;
@@ -60,7 +59,6 @@ public function testWhereRawWithQueryParameters()
         $this->assertTrue($liveResults->diffKeys($cachedResults)->isEmpty());
     }
 
-    /** @group test */
     public function testMultipleWhereRawCacheUniquely()
     {
         $book1 = (new UncachedBook)->first();

tests/Integration/CachedBuilderRelationshipsTest.php

@@ -25,7 +25,7 @@ public function testHasRelationshipResults()
             ->with("stores")
             ->has("stores")
             ->get();
-        $key = "genealabs:laravel-model-caching:testing:genealabslaravelmodelcachingtestsfixturesbook_exists_and_books.id_=_book_store.book_id-stores";
+        $key = "genealabs:laravel-model-caching:testing:genealabslaravelmodelcachingtestsfixturesbook-exists-and_books.id_=_book_store.book_id-stores";
         $tags = [
             "genealabs:laravel-model-caching:testing:genealabslaravelmodelcachingtestsfixturesbook",
             "genealabs:laravel-model-caching:testing:genealabslaravelmodelcachingtestsfixturesstore",

tests/Integration/CachedBuilderTest.php

@@ -523,7 +523,7 @@ public function testExistsRelationshipWhereClauseParsing()
         $authors = (new Author)->whereHas('books')
             ->get();
 
-        $key = sha1('genealabs:laravel-model-caching:testing:genealabslaravelmodelcachingtestsfixturesauthor_exists_and_authors.id_=_books.author_id');
+        $key = sha1('genealabs:laravel-model-caching:testing:genealabslaravelmodelcachingtestsfixturesauthor-exists-and_authors.id_=_books.author_id');
         $tags = ['genealabs:laravel-model-caching:testing:genealabslaravelmodelcachingtestsfixturesauthor'];
 
         $cachedResults = $this->cache()

tests/Integration/CachedModelTest.php

@@ -119,7 +119,7 @@ public function testWhereHasIsBeingCached()
             })
             ->get();
 
-        $key = sha1('genealabs:laravel-model-caching:testing:genealabslaravelmodelcachingtestsfixturesbook_exists_and_books.author_id_=_authors.id-id_=_1-author');
+        $key = sha1('genealabs:laravel-model-caching:testing:genealabslaravelmodelcachingtestsfixturesbook-exists-and_books.author_id_=_authors.id-id_=_1-author');
         $tags = [
             'genealabs:laravel-model-caching:testing:genealabslaravelmodelcachingtestsfixturesbook',
             'genealabs:laravel-model-caching:testing:genealabslaravelmodelcachingtestsfixturesauthor',