Fix generation of cache keys for queries with where clauses

Author: mikebronner

src/CachedBuilder.php

@@ -76,7 +76,7 @@ protected function getWhereClauses() : string
             $value = $where['value'] ?? implode('_', ($where['values'] ?? []));
 
             if (! $value) {
-                return '';
+                return $carry . '';
             }
 
             return "{$carry}-{$where['column']}_{$value}";

tests/Unit/CachedBuilderTest.php

@@ -440,10 +440,10 @@ public function testNestedRelationshipEagerloading()
         $this->assertEmpty($liveResults->diffAssoc($cachedResults));
     }
 
-    public function testNonEagerloadedRelationshipResolvesThroughCachedBuilder()
+    public function testLazyLoadedRelationshipResolvesThroughCachedBuilder()
     {
         $books = (new Author)->first()->books;
-        $key = 'genealabslaravelmodelcachingtestsfixturesbook-books.author_id_1-books.author_id_';
+        $key = 'genealabslaravelmodelcachingtestsfixturesbook-books.author_id_1';
         $tags = [
             'genealabslaravelmodelcachingtestsfixturesbook',
         ];
@@ -458,7 +458,7 @@ public function testNonEagerloadedRelationshipResolvesThroughCachedBuilder()
     public function testLazyLoadingOnResourceIsCached()
     {
         $books = (new AuthorResource((new Author)->first()))->books;
-        $key = 'genealabslaravelmodelcachingtestsfixturesbook-books.author_id_1-books.author_id_';
+        $key = 'genealabslaravelmodelcachingtestsfixturesbook-books.author_id_1';
         $tags = [
             'genealabslaravelmodelcachingtestsfixturesbook',
         ];
@@ -469,5 +469,4 @@ public function testLazyLoadingOnResourceIsCached()
         $this->assertEmpty($books->diffAssoc($cachedResults));
         $this->assertEmpty($liveResults->diffAssoc($cachedResults));
     }
-
 }