Merge branch 'master' of github.com:GeneaLabs/laravel-model-caching into laravel-5.5

# Conflicts:
#	tests/Unit/CachedBuilderTest.php

Author: mikebronner

tests/Unit/CachedBuilderTest.php

@@ -413,7 +413,7 @@ public function testValueModelResultsCreatesCache()
         $this->assertEquals($liveResults, $cachedResults);
     }
 
-    public function testNestedRelationshipEagerloading()
+    public function testNestedRelationshipEagerLoading()
     {
         $authors = collect([(new Author)->with('books.publisher')
                 ->first()]);
@@ -504,14 +504,34 @@ public function testNestedRelationshipWhereClauseParsing()
 
     public function testExistsRelationshipWhereClauseParsing()
     {
-        $authors = (new Author)->whereHas('books')
-            ->get();
-        $key = 'genealabslaravelmodelcachingtestsfixturesauthor_and_authors.id_=_books.author_id';
+
+        $authors = collect([(new Author)->whereHas('books')->first()]);
+
+        $key = 'genealabslaravelmodelcachingtestsfixturesauthor_and_authors.id_=_books.author_id-first';
         $tags = ['genealabslaravelmodelcachingtestsfixturesauthor'];
 
-        $cachedResults = cache()->tags($tags)->get($key);
-        $liveResults = (new UncachedAuthor)->whereHas('books')
-            ->get();
+        $cachedResults = collect([cache()->tags($tags)->get($key)]);
+
+        $liveResults = collect([(new UncachedAuthor)
+            ->whereHas('books')->first()]);
+
+        $this->assertTrue($authors->diffAssoc($cachedResults)->isEmpty());
+        $this->assertTrue($liveResults->diffAssoc($cachedResults)->isEmpty());        
+
+    }
+
+    public function testColumnsRelationshipWhereClauseParsing()
+    {
+        $author = (new Author)->orderBy('name')->first();
+
+        $authors = collect([(new Author)->where('name', '=', $author->name)->first()]);
+
+        $key = 'genealabslaravelmodelcachingtestsfixturesauthor-name_' . $author->name . '-first';
+        $tags = ['genealabslaravelmodelcachingtestsfixturesauthor'];
+
+        $cachedResults = collect([cache()->tags($tags)->get($key)]);
+
+        $liveResults = collect([(new UncachedAuthor)->where('name', '=', $author->name)->first()]);
 
         $this->assertEmpty($authors->diffAssoc($cachedResults));
         $this->assertEmpty($liveResults->diffAssoc($cachedResults));