wip.

Author: rennokki

src/Query/Builder.php

@@ -101,10 +101,6 @@ protected function getQueryCacheCallback(string $method = 'get', $columns = ['*'
         return function () use ($method, $columns) {
             $this->avoidCache = true;
 
-            if ($method === 'get') {
-                return $this->get($columns);
-            }
-
             return $this->{$method}($columns);
         };
     }
@@ -170,7 +166,7 @@ public function generatePlainCacheKey(string $method = 'get', $id = null, $appen
      * @param  array  $tags
      * @return bool
      */
-    public function flushQueryCache(array $tags = []): bool
+    public function flushQueryCache(array $tags = ['leqc']): bool
     {
         $cache = $this->getCacheDriver();
 
@@ -219,12 +215,11 @@ public function cacheFor($seconds)
     /**
      * Indicate that the query results should be cached forever.
      *
-     * @param  string|null $key
      * @return \Illuminate\Database\Query\Builder|static
      */
-    public function cacheForever($key = null)
+    public function cacheForever()
     {
-        return $this->cacheFor(-1, $key);
+        return $this->cacheFor(-1);
     }
 
     /**
@@ -234,7 +229,7 @@ public function cacheForever($key = null)
      */
     public function dontCache()
     {
-        $this->cacheTime = $this->cacheTags = null;
+        $this->avoidCache = true;
 
         return $this;
     }
@@ -255,7 +250,7 @@ public function doNotCache()
      * @param  string  $prefix
      * @return \Rennokki\QueryCache\Query\Builder
      */
-    public function prefix(string $prefix)
+    public function cachePrefix(string $prefix)
     {
         $this->cachePrefix = $prefix;
 

src/Traits/QueryCacheable.php

@@ -28,7 +28,7 @@ protected function newBaseQueryBuilder()
         }
 
         if ($this->cachePrefix) {
-            $builder->prefix($this->cachePrefix);
+            $builder->cachePrefix($this->cachePrefix);
         }
 
         if ($this->cacheDriver) {

tests/MethodsTest.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace Rennokki\QueryCache\Test;
+
+use Cache;
+use Rennokki\QueryCache\Test\Models\Post;
+
+class MethodsTest extends TestCase
+{
+    public function test_do_not_cache()
+    {
+        $post = factory(Post::class)->create();
+
+        $storedPost = Post::cacheFor(now()->addHours(1))->doNotCache()->first();
+        $cache = Cache::get('leqc:sqlitegetselect * from "posts" limit 1a:0:{}');
+        $this->assertNull($cache);
+
+        $storedPost = Post::cacheFor(now()->addHours(1))->dontCache()->first();
+        $cache = Cache::get('leqc:sqlitegetselect * from "posts" limit 1a:0:{}');
+        $this->assertNull($cache);
+    }
+
+    public function test_cache_prefix()
+    {
+        $post = factory(Post::class)->create();
+        $storedPost = Post::cacheFor(now()->addHours(1))->cachePrefix('test')->first();
+        $cache = Cache::get('test:sqlitegetselect * from "posts" limit 1a:0:{}');
+
+        $this->assertNotNull($cache);
+    }
+
+    public function test_cache_tags()
+    {
+        $post = factory(Post::class)->create();
+        $storedPost = Post::cacheFor(now()->addHours(1))->cacheTags(['test'])->first();
+
+        $cache = Cache::get('leqc:sqlitegetselect * from "posts" limit 1a:0:{}');
+        $this->assertNull($cache);
+
+        $cache = Cache::tags(['test'])->get('leqc:sqlitegetselect * from "posts" limit 1a:0:{}');
+        $this->assertNotNull($cache);
+    }
+
+    public function test_cache_flush_with_the_right_tag()
+    {
+        $post = factory(Post::class)->create();
+        $storedPost = Post::cacheFor(now()->addHours(1))->cacheTags(['test'])->first();
+
+        $cache = Cache::tags(['test'])->get('leqc:sqlitegetselect * from "posts" limit 1a:0:{}');
+        $this->assertNotNull($cache);
+
+        Post::flushQueryCache(['test']);
+
+        $cache = Cache::tags(['test'])->get('leqc:sqlitegetselect * from "posts" limit 1a:0:{}');
+        $this->assertNull($cache);
+    }
+
+    public function test_cache_flush_without_the_right_tag()
+    {
+        $post = factory(Post::class)->create();
+        $storedPost = Post::cacheFor(now()->addHours(1))->cacheTags(['test'])->first();
+
+        $cache = Cache::tags(['test'])->get('leqc:sqlitegetselect * from "posts" limit 1a:0:{}');
+        $this->assertNotNull($cache);
+
+        Post::flushQueryCache(['test2']);
+
+        $cache = Cache::tags(['test'])->get('leqc:sqlitegetselect * from "posts" limit 1a:0:{}');
+        $this->assertNotNull($cache);
+    }
+}