Changeset 4767

Timestamp:

08/09/08 21:42:52 (5 months ago)

Author:

romanb

Message:

Fixed APC cache driver. Dont know where the old Doctrine_Cache_Apc#save() code came from... if anyone knows please tell me. Added a testcase to test using apc as a result cache. Fixed #1196.

Location:

branches/1.0

Files:

• lib/Doctrine/Cache/Apc.php (modified) (1 diff)
• tests/Cache/ApcTestCase.php (modified) (1 diff)

branches/1.0/lib/Doctrine/Cache/Apc.php

@@ -85 +85 @@
     public function save($id, $data, $lifeTime = false)
     {
-        return (bool) apc_store($id, array($data, time()), $lifeTime);
+        return (bool) apc_store($id, $data, $lifeTime);
     }
 

branches/1.0/tests/Cache/ApcTestCase.php

@@ -34 +34 @@
 class Doctrine_Cache_Apc_TestCase extends Doctrine_UnitTestCase 
 {
-
+    public function prepareTables()
+    {
+        $this->tables = array('User');
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    {
+        $user = new User();
+        $user->name = 'Hans';
+        $user->save();
+    }
+    
+    public function testApcAsResultCache()
+    {
+        if (!extension_loaded("apc")) {
+            return;
+        }
+        
+        // clear user cache to make sure we always get the same behavior:
+        // 1st iteration cache miss, subsequent iterations cache hit.
+        apc_clear_cache("user");
+        
+        $cacheDriver = new Doctrine_Cache_Apc();
+        $this->conn->setAttribute(Doctrine::ATTR_RESULT_CACHE, $cacheDriver);
+        
+        $queryCountBefore = $this->conn->count();
+        
+        for ($i = 0; $i < 10; $i++) {
+            $u = Doctrine_Query::create()
+                ->from('User u')
+                ->addWhere('u.name = ?', array('Hans'))
+                ->useResultCache()
+                ->execute();
+            $this->assertEqual(1, count($u));
+            $this->assertEqual("Hans", $u[0]->name);
+        }
+        
+        // Just 1 query should be run
+        $this->assertEqual($queryCountBefore + 1, $this->conn->count());
+    }
 }