WIP - caching select clauses properly

Author: mikebronner

src/CacheKey.php

@@ -98,10 +98,17 @@ protected function getOrderByClauses() : string
 
     protected function getQueryColumns(array $columns) : string
     {
-        if ($columns === ["*"] || $columns === []) {
+        if (($columns === ["*"]
+                || $columns === [])
+            && ! $this->query->columns
+        ) {
             return "";
         }
 
+        if ($this->query->columns) {
+            return "_" . implode("_", $this->query->columns);
+        }
+
         return "_" . implode("_", $columns);
     }
 

tests/Integration/CachedBuilder/SelectTest.php

@@ -49,4 +49,29 @@ public function testSelectWithRawColumns()
         $this->assertEquals($liveResults, $books);
         $this->assertEquals($liveResults, $cachedResults);
     }
+
+    // public function testSelectFieldsAreCached()
+    // {
+    //     $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor_id_name-first');
+    //     $tags = [
+    //         'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor',
+    //     ];
+
+    //     $authorFields = (new Author)
+    //         ->select("id", "name")
+    //         ->first()
+    //         ->getAttributes();
+    //     $uncachedFields = (new UncachedAuthor)
+    //         ->select("id", "name")
+    //         ->first()
+    //         ->getAttributes();
+    //     $cachedFields = $this
+    //         ->cache()
+    //         ->tags($tags)
+    //         ->get($key)['value']
+    //         ->getAttributes();
+
+    //     $this->assertEquals($cachedFields, $authorFields);
+    //     $this->assertEquals($cachedFields, $uncachedFields);
+    // }
 }