bugfixes

src/Spiritix/LadaCache/QueryHandler.php

@@ -115,7 +115,9 @@ public function cacheQuery($queryClosure)
 
         // If not, execute the query closure and cache the result
         if ($result === null) {
-            $this->cache->set($key, $tagger->getTags(), $queryClosure());
+            $result = $queryClosure();
+
+            $this->cache->set($key, $tagger->getTags(), $result);
         }
 
         $action = ($result === null) ? 'Miss' : 'Hit';

src/Spiritix/LadaCache/Tagger.php

@@ -71,8 +71,6 @@ public function __construct(Reflector $reflector)
      */
     public function getTags()
     {
-        $tags = [];
-
         // Get affected database and tables, add prefixes
         $database = $this->prefix($this->reflector->getDatabase(), self::PREFIX_DATABASE);
 
@@ -90,12 +88,20 @@ public function getTags()
 
         // Create the table tags with corresponding prefix
         // Depending on whether the queries are specific or not
-        $tags[] = $this->getTableTags($tables, $rows);
+        $tags = $this->getTableTags($tables, $rows);
 
         // Then we loop trough all these tags and add a tag for each row
         // Consisting of the prefixed table and the row with prefix
         foreach ($tables as $table) {
-            $tags = array_merge($tags, $this->prefix($rows[$table], $this->prefix(self::PREFIX_ROW, $table)));
+
+            if (!isset($rows[$table])) {
+                continue;
+            }
+
+            $tablePrefix = $this->prefix($table, self::PREFIX_TABLE_SPECIFIC);
+            $rowPrefix = $this->prefix(self::PREFIX_ROW, $tablePrefix);
+
+            $tags = array_merge($tags, $this->prefix($rows[$table], $rowPrefix));
         }
 
         return $this->prefix($tags, $database);

tests/IntegrationTest.php

@@ -59,7 +59,7 @@ public function testUpdate()
         $this->assertTrue($this->hasQuery($rowBuilder1->getQuery()));
         $this->assertTrue($this->hasQuery($rowBuilder2->getQuery()));
 
-        $car = Car::find(1);
+        $car = Car::findOrFail(1);
         $car->name = 'New';
         $car->save();