Fixes #62

Author: mikebronner

src/CacheKey.php

@@ -31,6 +31,7 @@ public function make(
         $key .= $this->getOffsetClause();
         $key .= $this->getLimitClause();
         $key .= $keyDifferentiator;
+dump($key);
         $key = sha1($key);
 
         return $key;
@@ -90,9 +91,11 @@ protected function getQueryColumns(array $columns) : string
 
     protected function getTypeClause($where) : string
     {
-        return in_array($where['type'], ['In', 'Null', 'NotNull'])
+        $type =in_array($where['type'], ['In', 'Null', 'NotNull'])
             ? strtolower($where['type'])
-            : '';
+            : strtolower($where['operator']);
+
+        return str_replace(' ', '_', $type);
     }
 
     protected function getValuesClause(array $where = null) : string
@@ -149,8 +152,8 @@ protected function getOtherClauses(array $where, string $carry = null) : string
             return '';
         }
 
-        $value = array_get($where, 'value');
-        $value .= $this->getTypeClause($where);
+        $value = $this->getTypeClause($where);
+        $value .= "_" . array_get($where, 'value');
         $value .= $this->getValuesClause($where);
 
         return "{$carry}-{$where['column']}_{$value}";

tests/Unit/CachedBuilderTest.php

@@ -693,4 +693,42 @@ public function testDelete()
         $this->assertNull($cachedResult);
         $this->assertNull($deletedAuthor);
     }
+
+    private function processWhereClauseTestWithOperator(string $operator)
+    {
+        $author = (new Author)->first();
+        $authors = (new Author)
+            ->where('name', $operator, $author->name)
+            ->get();
+        $keyParts = [
+            'genealabslaravelmodelcachingtestsfixturesauthor-name',
+            '_',
+            str_replace(' ', '_', strtolower($operator)),
+            '_',
+            $author->name,
+        ];
+        $key = sha1(implode('', $keyParts));
+        $tags = ['genealabslaravelmodelcachingtestsfixturesauthor'];
+
+        $cachedResults = cache()
+            ->tags($tags)
+            ->get($key);
+        $liveResults = (new UncachedAuthor)
+            ->where('name', $operator, $author->name)
+            ->get();
+
+        $this->assertEmpty($authors->diffAssoc($cachedResults));
+        $this->assertEmpty($liveResults->diffAssoc($cachedResults));
+    }
+
+    public function testWhereClauseParsingOfOperators()
+    {
+        $this->processWhereClauseTestWithOperator('=');
+        $this->processWhereClauseTestWithOperator('!=');
+        $this->processWhereClauseTestWithOperator('<>');
+        $this->processWhereClauseTestWithOperator('>');
+        $this->processWhereClauseTestWithOperator('<');
+        $this->processWhereClauseTestWithOperator('LIKE');
+        $this->processWhereClauseTestWithOperator('NOT LIKE');
+    }
 }