Merge pull request #50 from faryar76/1.0

Fixed bug #41

Author: timothymarois

src/QueryLogic.php

@@ -42,6 +42,29 @@ public function __construct(Database $database)
         }
     }
 
+    private function loadDocuments()
+    {
+        $predicates = $this->predicate->get();
+
+        if ($this->cache===false)
+        {
+            $this->documents = $this->database->findAll(true,false);
+            return $this;
+        }
+
+        $this->cache->setKey(json_encode($predicates));
+
+        if ($cached_documents = $this->cache->get())
+        {
+            $this->documents = $cached_documents;
+
+            $this->sort();
+            $this->offsetLimit();
+             return $this;
+        }
+        $this->documents = $this->database->findAll(true,false);
+        return $this;
+    }
     /**
     * run
     *
@@ -57,22 +80,7 @@ public function run()
             $predicates = 'findAll';
         }
 
-        if ($this->cache !== false)
-        {
-            $this->cache->setKey(json_encode($predicates));
-
-            if ($cached_documents = $this->cache->get())
-            {
-                $this->documents = $cached_documents;
-
-                $this->sort();
-                $this->offsetLimit();
-
-                return $this;
-            }
-        }
-
-        $this->documents = $this->database->findAll(true,false);
+        $this->loadDocuments();
 
         if ($predicates !== 'findAll')
         {

tests/DatabaseTest.php

@@ -308,4 +308,34 @@ public function test_must_return_exception_on_non_exist_method()
         $this->expectException(\BadMethodCallException::class);
         $results = $db->none('name','=','John')->andWhere('email','==','john@example.com')->resultDocuments();
     }
+    /**
+     * based on issue #41
+     * results() returns document instead of array #41
+     */
+    public function test_must_return_array_on_select_an_culomn_from_cache()
+    {
+        $db = new \Filebase\Database([
+            'dir' => __DIR__.'/databases/saved',
+            'cache' => true
+        ]);
+
+        $db->flush(true);
+
+        for ($x = 1; $x <= 10; $x++)
+    	{
+    		$user = $db->get(uniqid());
+    		$user->name  = 'John';
+            $user->email = 'john@example.com';
+    		$user->save();
+    	}
+
+        $db->where('name','=','John')->andWhere('email','==','john@example.com')->select('email')->results();
+        $result_from_cache = $db->where('name','=','John')->andWhere('email','==','john@example.com')->select('email')->results();
+
+        $this->assertCount(10,$result_from_cache);
+        $this->assertEquals(['email'=>'john@example.com'],$result_from_cache[0]);
+        $this->assertInternalType('array', $result_from_cache[0]);
+        $this->assertInternalType('string', $result_from_cache[0]['email']);
+        $db->flush(true);
+    }
 }