Handled Expressions in min / max methods

Author: Josh Ralph

src/Traits/Buildable.php

@@ -144,7 +144,7 @@ public function max($column)
             return parent::max($column);
         }
 
-        $cacheKey = $this->makeCacheKey(["*"], null, "-max_{$column}");
+        $cacheKey = $this->makeCacheKey(["*"], null, "-max_{$this->expressionToString($column)}");
 
         return $this->cachedValue(func_get_args(), $cacheKey);
     }
@@ -155,7 +155,7 @@ public function min($column)
             return parent::min($column);
         }
 
-        $cacheKey = $this->makeCacheKey(["*"], null, "-min_{$column}");
+        $cacheKey = $this->makeCacheKey(["*"], null, "-min_{$this->expressionToString($column)}");
 
         return $this->cachedValue(func_get_args(), $cacheKey);
     }

tests/Integration/CachedBuilderTest.php

@@ -318,6 +318,26 @@ public function testMaxModelResultsCreatesCache()
         $this->assertEquals($liveResult, $cachedResult);
     }
 
+    public function testRawMaxModelResultsCreatesCache()
+    {
+        $authorId = (new Author)->with('books', 'profile')
+            ->max(new Expression('id + id'));
+        $key = sha1("genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:authors:genealabslaravelmodelcachingtestsfixturesauthor-authors.deleted_at_null-testing:{$this->testingSqlitePath}testing.sqlite:books-testing:{$this->testingSqlitePath}testing.sqlite:profile-max_id + id");
+        $tags = [
+            "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesauthor",
+            "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesbook",
+            "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesprofile",
+        ];
+
+        $cachedResult = $this->cache()->tags($tags)
+            ->get($key)['value'];
+        $liveResult = (new UncachedAuthor)->with('books', 'profile')
+            ->max(new Expression('id + id'));
+
+        $this->assertEquals($authorId, $cachedResult);
+        $this->assertEquals($liveResult, $cachedResult);
+    }
+
     public function testMinModelResultsCreatesCache()
     {
         $authorId = (new Author)->with('books', 'profile')
@@ -338,6 +358,26 @@ public function testMinModelResultsCreatesCache()
         $this->assertEquals($liveResult, $cachedResult);
     }
 
+    public function testRawMinModelResultsCreatesCache()
+    {
+        $authorId = (new Author)->with('books', 'profile')
+            ->min(new Expression('id + id'));
+        $key = sha1("genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:authors:genealabslaravelmodelcachingtestsfixturesauthor-authors.deleted_at_null-testing:{$this->testingSqlitePath}testing.sqlite:books-testing:{$this->testingSqlitePath}testing.sqlite:profile-min_id + id");
+        $tags = [
+            "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesauthor",
+            "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesbook",
+            "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesprofile",
+        ];
+
+        $cachedResult = $this->cache()->tags($tags)
+            ->get($key)['value'];
+        $liveResult = (new UncachedAuthor)->with('books', 'profile')
+            ->min(new Expression('id + id'));
+
+        $this->assertEquals($authorId, $cachedResult);
+        $this->assertEquals($liveResult, $cachedResult);
+    }
+
     public function testPluckModelResultsCreatesCache()
     {
         $authors = (new Author)->with('books', 'profile')