Add model table to cache key

mikebronner · mikebronner · commit b442a6840254 · 2018-11-30T06:42:34.000-08:00
Fixes #192 Fixes #189
diff --git a/composer.json b/composer.json
@@ -28,7 +28,8 @@
         "phpunit/phpunit": "7.*",
         "predis/predis": "*",
         "sebastian/phpcpd": "*",
-        "symfony/thanks": "*"
+        "symfony/thanks": "*",
+        "codedungeon/phpunit-result-printer": "^0.23.4"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/CacheKey.php b/src/CacheKey.php
@@ -30,6 +30,7 @@ public function make(
         string $keyDifferentiator = ""
     ) : string {
         $key = $this->getCachePrefix();
+        $key .= $this->getTableSlug();
         $key .= $this->getModelSlug();
         $key .= $this->getIdColumn($idColumn ?: "");
         $key .= $this->getQueryColumns($columns);
@@ -57,6 +58,12 @@ protected function getLimitClause() : string
         return "-limit_{$this->query->limit}";
     }
 
+    protected function getTableSlug() : string
+    {
+        return str_slug($this->model->getTable())
+            . ":";
+    }
+
     protected function getModelSlug() : string
     {
         return str_slug(get_class($this->model));
diff --git a/tests/Integration/CachedBuilder/FindOrFailTest.php b/tests/Integration/CachedBuilder/FindOrFailTest.php
@@ -17,14 +17,12 @@
 
 class FindOrFailTest extends IntegrationTestCase
 {
-    
-
     public function testFindOrFailCachesModels()
     {
         $author = (new Author)
             ->findOrFail(1);
 
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor-find_1');
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor-find_1');
         $tags = [
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor',
         ];
diff --git a/tests/Integration/CachedBuilder/FindTest.php b/tests/Integration/CachedBuilder/FindTest.php
@@ -17,12 +17,10 @@
 
 class FindTest extends IntegrationTestCase
 {
-    
-
     public function testFindModelResultsCreatesCache()
     {
         $author = collect()->push((new Author)->find(1));
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor_1');
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor_1');
         $tags = [
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor',
         ];
diff --git a/tests/Integration/CachedBuilder/ForceDeleteTest.php b/tests/Integration/CachedBuilder/ForceDeleteTest.php
@@ -29,7 +29,7 @@ public function testForceDeleteClearsCache()
                 'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor',
             ])
             ->get(sha1(
-                'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor-id_=_1'
+                'genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor-id_=_1'
             ))["value"];
 
         (new Author)
@@ -41,7 +41,7 @@ public function testForceDeleteClearsCache()
                 'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor',
             ])
             ->get(sha1(
-                'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor-id_=_1'
+                'genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor-id_=_1'
             ))["value"];
 
         $this->assertEquals(get_class($resultsBefore), get_class($author));
diff --git a/tests/Integration/CachedBuilder/GetTest.php b/tests/Integration/CachedBuilder/GetTest.php
@@ -23,7 +23,7 @@ public function testGetModelResultsCreatesCache()
     {
         $authors = (new Author)->with('books', 'profile')
             ->get();
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor-books-profile');
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor-books-profile');
         $tags = [
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor',
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook',
@@ -58,7 +58,7 @@ public function testAccessingGetResultsViaArrayIndexDoesNotError()
 
     public function testGetWithFieldArrayCachesResults()
     {
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor_id_name');
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor_id_name');
         $tags = [
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor',
         ];
diff --git a/tests/Integration/CachedBuilder/InRandomOrderQueryTest.php b/tests/Integration/CachedBuilder/InRandomOrderQueryTest.php
@@ -17,8 +17,6 @@
 
 class InRandomOrderQueryTest extends IntegrationTestCase
 {
-    
-
     public function testInRandomOrderCachesResults()
     {
         $cachedBook1 = (new Book)
diff --git a/tests/Integration/CachedBuilder/LazyLoadTest.php b/tests/Integration/CachedBuilder/LazyLoadTest.php
@@ -17,11 +17,9 @@
 
 abstract class LazyLoadTest extends IntegrationTestCase
 {
-    
-
 //     public function testLazyLoadingRelationshipQuery()
 //     {
-//         $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook-id_<_5');
+//         $key = sha1('genealabs:laravel-model-caching:testing::memory::books:genealabslaravelmodelcachingtestsfixturesbook-id_<_5');
 //         $tags = [
 //             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook',
 //         ];
diff --git a/tests/Integration/CachedBuilder/PaginateTest.php b/tests/Integration/CachedBuilder/PaginateTest.php
@@ -25,7 +25,7 @@ public function testPaginationIsCached()
         $authors = (new Author)
             ->paginate(3);
 
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor-paginate_by_3_page_1');
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor-paginate_by_3_page_1');
         $tags = [
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor',
         ];
@@ -155,7 +155,7 @@ public function testPaginationWithCustomOptionsReturnsCorrectLinks()
 
     public function testCustomPageNamePagination()
     {
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor-paginate_by_3_custom-page_1');
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor-paginate_by_3_custom-page_1');
         $tags = [
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor',
         ];
diff --git a/tests/Integration/CachedBuilder/SelectTest.php b/tests/Integration/CachedBuilder/SelectTest.php
@@ -19,7 +19,7 @@ class SelectTest extends IntegrationTestCase
 {
     public function testSelectWithRawColumns()
     {
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook_orderBy_author_id_asc');
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::books:genealabslaravelmodelcachingtestsfixturesbook_orderBy_author_id_asc');
         $tags = [
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook',
         ];
diff --git a/tests/Integration/CachedBuilder/UpdateExistingPivotTest.php b/tests/Integration/CachedBuilder/UpdateExistingPivotTest.php
@@ -17,8 +17,6 @@
 
 class UpdateExistingPivotTest extends IntegrationTestCase
 {
-    
-
     public function testInRandomOrderCachesResults()
     {
         $book = (new Book)
diff --git a/tests/Integration/CachedBuilder/WhenTest.php b/tests/Integration/CachedBuilder/WhenTest.php
@@ -17,11 +17,9 @@
 
 class WhenTest extends IntegrationTestCase
 {
-    
-
     public function testWhenQuery()
     {
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook-id_<_5');
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::books:genealabslaravelmodelcachingtestsfixturesbook-id_<_5');
         $tags = [
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook',
         ];
diff --git a/tests/Integration/CachedBuilder/WhereHasTest.php b/tests/Integration/CachedBuilder/WhereHasTest.php
@@ -17,8 +17,6 @@
 
 class WhereHasTest extends IntegrationTestCase
 {
-    
-
     public function testWhereHasClause()
     {
         $authors = (new Author)
diff --git a/tests/Integration/CachedBuilder/WhereInRawTest.php b/tests/Integration/CachedBuilder/WhereInRawTest.php
@@ -19,7 +19,7 @@ class WhereInRawTest extends IntegrationTestCase
 {
     public function testWhereInRawUsingRelationship()
     {
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor-books');
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor-books');
         $tags = [
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor',
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook',
diff --git a/tests/Integration/CachedBuilder/WhereInTest.php b/tests/Integration/CachedBuilder/WhereInTest.php
@@ -19,7 +19,7 @@ class WhereInTest extends IntegrationTestCase
 {
     public function testWithInUsingCollectionQuery()
     {
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook-author_id_in_1_2_3_4');
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::books:genealabslaravelmodelcachingtestsfixturesbook-author_id_in_1_2_3_4');
         $tags = [
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook',
         ];
diff --git a/tests/Integration/CachedBuilder/WhereJsonContainsTest.php b/tests/Integration/CachedBuilder/WhereJsonContainsTest.php
@@ -36,7 +36,7 @@ public function setUp()
 
     public function testWithInUsingCollectionQuery()
     {
-        $key = sha1('genealabs:laravel-model-caching:pgsql:testing:genealabslaravelmodelcachingtestsfixturesauthor-finances->total_jsoncontains_5000');
+        $key = sha1('genealabs:laravel-model-caching:pgsql:testing:authors:genealabslaravelmodelcachingtestsfixturesauthor-finances->total_jsoncontains_5000');
         $tags = [
             'genealabs:laravel-model-caching:pgsql:testing:genealabslaravelmodelcachingtestsfixturesauthor',
         ];
diff --git a/tests/Integration/CachedBuilder/WhereNotInTest.php b/tests/Integration/CachedBuilder/WhereNotInTest.php
@@ -19,7 +19,7 @@ class WhereNotInTest extends IntegrationTestCase
 {
     public function testWhereNotInQuery()
     {
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook-author_id_not_in_1_2_3_4');
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::books:genealabslaravelmodelcachingtestsfixturesbook-author_id_not_in_1_2_3_4');
         $tags = [
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook',
         ];
@@ -44,7 +44,7 @@ public function testWhereNotInQuery()
 
     public function testWhereNotInResults()
     {
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook-id_not_in_1_2');
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::books:genealabslaravelmodelcachingtestsfixturesbook-id_not_in_1_2');
         $tags = [
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook',
         ];
@@ -65,7 +65,7 @@ public function testWhereNotInResults()
 
     public function testWhereNotInSubquery()
     {
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook-id_notinsub_book-id_<_10');
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::books:genealabslaravelmodelcachingtestsfixturesbook-id_notinsub_bookbooks:-id_<_10');
         $tags = [
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook',
         ];
diff --git a/tests/Integration/CachedBuilder/WhereNullTest.php b/tests/Integration/CachedBuilder/WhereNullTest.php
@@ -17,8 +17,6 @@
 
 class WhereNullTest extends IntegrationTestCase
 {
-    
-
     public function testWhereNullClause()
     {
         $books = (new Book)
diff --git a/tests/Integration/CachedBuilder/WhereRawTest.php b/tests/Integration/CachedBuilder/WhereRawTest.php
@@ -17,15 +17,13 @@
 
 class WhereRawTest extends IntegrationTestCase
 {
-    
-
     public function testRawWhereClauseParsing()
     {
         $authors = collect([(new Author)
             ->whereRaw('name <> \'\'')
             ->first()]);
 
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor_and_name-first');
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor_and_name-first');
         $tags = ['genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor'];
 
         $cachedResults = collect([$this->cache()->tags($tags)->get($key)['value']]);
@@ -45,7 +43,7 @@ public function testWhereRawWithQueryParameters()
             ->whereRaw("name != 'test3'")
             ->whereRaw('name = ? AND name != ?', [$authorName, "test2"])
             ->get();
-        $key = sha1("genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthorname_!=_test_and_name_!=_'test3'_and_name_=_Guido_Feest__AND_name_!=_test2");
+        $key = sha1("genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthorname_!=_test_and_name_!=_'test3'_and_name_=_Guido_Feest__AND_name_!=_test2");
         $tags = ['genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor'];
 
         $cachedResults = collect([$this->cache()->tags($tags)->get($key)['value']]);
diff --git a/tests/Integration/CachedBuilder/WhereTest.php b/tests/Integration/CachedBuilder/WhereTest.php
@@ -17,8 +17,6 @@
 
 class WhereTest extends IntegrationTestCase
 {
-
-
     public function testWithQuery()
     {
         $books = (new Book)
@@ -45,7 +43,7 @@ public function testColumnsRelationshipWhereClauseParsing()
         $authors = (new Author)
             ->where('name', '=', $author->name)
             ->get();
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor-name_=_' .
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor-name_=_' .
             $author->name);
         $tags = ['genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor'];
 
@@ -67,7 +65,7 @@ private function processWhereClauseTestWithOperator(string $operator)
             ->where('name', $operator, $author->name)
             ->get();
         $keyParts = [
-            'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor-name',
+            'genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor-name',
             '_',
             str_replace(' ', '_', strtolower($operator)),
             '_',
@@ -100,7 +98,7 @@ public function testWhereClauseParsingOfOperators()
 
     public function testTwoWhereClausesAfterEachOther()
     {
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor-id_>_-id_<_100');
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor-id_>_-id_<_100');
         $tags = ['genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor'];
 
         $authors = (new Author)
diff --git a/tests/Integration/CachedBuilder/WithTest.php b/tests/Integration/CachedBuilder/WithTest.php
@@ -63,7 +63,7 @@ public function testMultiLevelWithQuery()
 
     public function testWithBelongsToManyRelationshipQuery()
     {
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook-books.id_=_3-stores-first');
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::books:genealabslaravelmodelcachingtestsfixturesbook-books.id_=_3-stores-first');
         $tags = [
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook',
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesstore',
diff --git a/tests/Integration/CachedBuilderMultipleQueryTest.php b/tests/Integration/CachedBuilderMultipleQueryTest.php
@@ -17,8 +17,6 @@
 
 class CachedBuilderMultipleQueryTest extends IntegrationTestCase
 {
-    
-
     public function testCallingAllThenFirstQueriesReturnsDifferingResults()
     {
         $allAuthors = (new Author)->all();
diff --git a/tests/Integration/CachedBuilderRelationshipsTest.php b/tests/Integration/CachedBuilderRelationshipsTest.php
@@ -17,15 +17,13 @@
 
 class CachedBuilderRelationshipsTest extends IntegrationTestCase
 {
-    
-
     public function testHasRelationshipResults()
     {
         $booksWithStores = (new Book)
             ->with("stores")
             ->has("stores")
             ->get();
-        $key = "genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook-exists-and_books.id_=_book_store.book_id-stores";
+        $key = "genealabs:laravel-model-caching:testing::memory::books:genealabslaravelmodelcachingtestsfixturesbook-exists-and_books.id_=_book_store.book_id-stores";
         $tags = [
             "genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook",
             "genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesstore",
diff --git a/tests/Integration/CachedBuilderTest.php b/tests/Integration/CachedBuilderTest.php
diff --git a/tests/Integration/CachedModelTest.php b/tests/Integration/CachedModelTest.php
diff --git a/tests/Integration/Console/Commands/FlushTest.php b/tests/Integration/Console/Commands/FlushTest.php
diff --git a/tests/Integration/DisabledCachedBuilderTest.php b/tests/Integration/DisabledCachedBuilderTest.php
diff --git a/tests/Integration/DisabledCachedModelTest.php b/tests/Integration/DisabledCachedModelTest.php
diff --git a/tests/Integration/Traits/BuilderCachingTest.php b/tests/Integration/Traits/BuilderCachingTest.php
diff --git a/tests/Integration/Traits/CachableTest.php b/tests/Integration/Traits/CachableTest.php

Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,12 @@`
`17`	`17`
`18`	`18`	`class FindOrFailTest extends IntegrationTestCase`
`19`	`19`	`{`
`20`		`-`
`21`		`-`
`22`	`20`	`public function testFindOrFailCachesModels()`
`23`	`21`	`{`
`24`	`22`	`$author = (new Author)`
`25`	`23`	`->findOrFail(1);`
`26`	`24`
`27`		`- $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor-find_1');`
	`25`	`+ $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor-find_1');`
`28`	`26`	`$tags = [`
`29`	`27`	`'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor',`
`30`	`28`	`];`
Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,10 @@`
`17`	`17`
`18`	`18`	`class FindTest extends IntegrationTestCase`
`19`	`19`	`{`
`20`		`-`
`21`		`-`
`22`	`20`	`public function testFindModelResultsCreatesCache()`
`23`	`21`	`{`
`24`	`22`	`$author = collect()->push((new Author)->find(1));`
`25`		`- $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor_1');`
	`23`	`+ $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor_1');`
`26`	`24`	`$tags = [`
`27`	`25`	`'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor',`
`28`	`26`	`];`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@`
`17`	`17`
`18`	`18`	`class InRandomOrderQueryTest extends IntegrationTestCase`
`19`	`19`	`{`
`20`		`-`
`21`		`-`
`22`	`20`	`public function testInRandomOrderCachesResults()`
`23`	`21`	`{`
`24`	`22`	`$cachedBook1 = (new Book)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class SelectTest extends IntegrationTestCase`
`19`	`19`	`{`
`20`	`20`	`public function testSelectWithRawColumns()`
`21`	`21`	`{`
`22`		`- $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook_orderBy_author_id_asc');`
	`22`	`+ $key = sha1('genealabs:laravel-model-caching:testing::memory::books:genealabslaravelmodelcachingtestsfixturesbook_orderBy_author_id_asc');`
`23`	`23`	`$tags = [`
`24`	`24`	`'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook',`
`25`	`25`	`];`