Fixed generation of cache key where clauses

Fixes #244

Author: mikebronner

src/CacheKey.php

@@ -158,7 +158,7 @@ protected function getValuesFromWhere(array $where) : string
 
     protected function getValuesFromBindings(array $where, string $values) : string
     {
-        if ($this->query->bindings["where"][$this->currentBinding] ?? false) {
+        if (($this->query->bindings["where"][$this->currentBinding] ?? false) !== false) {
             $values = $this->query->bindings["where"][$this->currentBinding];
             $this->currentBinding++;
 
@@ -168,7 +168,7 @@ protected function getValuesFromBindings(array $where, string $values) : string
             }
         }
 
-        return $values ?: "";
+        return $values;
     }
 
     protected function getWhereClauses(array $wheres = []) : string

tests/Integration/CachedBuilder/WhereRawTest.php

@@ -123,4 +123,27 @@ public function testWhereRawParametersCacheUniquely()
         $this->assertEquals($cachedBook1->first()->title, $result1->first()->title);
         $this->assertEquals($cachedBook2->first()->title, $result2->first()->title);
     }
+
+    public function testWhereRawParametersAfterWhereClause()
+    {
+        $book1 = (new UncachedBook)->first();
+        $book2 = (new UncachedBook)->orderBy("id", "DESC")->first();
+
+        $result1 = (new Book)
+            ->where("id", ">", 0)
+            ->whereRaw("id = ?", [$book1->id])
+            ->get();
+        $result2 = (new Book)
+            ->where("id", ">", 1)
+            ->whereRaw("id = ?", [$book2->id])
+            ->get();
+        $key1 = sha1("genealabs:laravel-model-caching:testing::memory::books:genealabslaravelmodelcachingtestsfixturesbook-id_>_0-_and_id_=_{$book1->id}");
+        $key2 = sha1("genealabs:laravel-model-caching:testing::memory::books:genealabslaravelmodelcachingtestsfixturesbook-id_>_1-_and_id_=_{$book2->id}");
+        $tags = ['genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook'];
+        $cachedBook1 = $this->cache()->tags($tags)->get($key1)['value'];
+        $cachedBook2 = $this->cache()->tags($tags)->get($key2)['value'];
+
+        $this->assertEquals($cachedBook1->first()->title, $result1->first()->title);
+        $this->assertEquals($cachedBook2->first()->title, $result2->first()->title);
+    }
 }

tests/Integration/CachedBuilder/WhereTest.php

@@ -98,7 +98,7 @@ public function testWhereClauseParsingOfOperators()
 
     public function testTwoWhereClausesAfterEachOther()
     {
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor-id_>_-id_<_100');
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor-id_>_0-id_<_100');
         $tags = ['genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor'];
 
         $authors = (new Author)