From b3ad23bbd10ea13e05396ceb1551bfa91ec88ced Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Fri, 9 Feb 2007 20:02:49 +0000
Subject: [PATCH] cache implementation continues

---
 lib/Doctrine/Cache.php        | 38 +++++++++++++++++++++--------------
 lib/Doctrine/Column.php       | 18 ++++++++++++++++-
 lib/Doctrine/Db/Statement.php |  4 ++++
 3 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/lib/Doctrine/Cache.php b/lib/Doctrine/Cache.php
index 10d7a9d09..1f9807526 100644
--- a/lib/Doctrine/Cache.php
+++ b/lib/Doctrine/Cache.php
@@ -216,15 +216,11 @@ class Doctrine_Cache extends Doctrine_Db_EventListener implements Countable, Ite
         $rand = (mt_rand() / mt_getrandmax());
 
     	if ($rand <= $this->_options['cleanPropability']) {
-            $content = file_get_contents($this->_statsFile);
-            $queries = explode("\n", $content);
+            $queries = $this->readStats();
 
             $stats   = array();
     
             foreach ($queries as $query) {
-                if (is_array($query)) {
-                    $query = $query[0];
-                }
                 if (isset($stats[$query])) {
                     $stats[$query]++;
                 } else {
@@ -238,17 +234,29 @@ class Doctrine_Cache extends Doctrine_Db_EventListener implements Countable, Ite
             while ($i--) {
                 $element = next($stats);
                 $query   = key($stats);
-    
-                if (is_array($query)) {
-                    $hash = md5(serialize($query));
-                } else {
-                    $hash = md5($query);
-                }
-    
+                
+                $hash = md5($query);
+
                 $this->_driver->delete($hash);
             }
         }
     }
+    /**
+     * readStats
+     *
+     * @return array
+     */
+    public function readStats() 
+    {
+    	if ($this->_options['statsFile'] !== false) {
+    	   $content = file_get_contents($this->_options['statsFile']);
+           
+           $e = explode("\n", $content);
+           
+           return array_map('unserialize', $e);
+    	}
+    	return array();
+    }
     /**
      * appendStats
      *
@@ -266,7 +274,7 @@ class Doctrine_Cache extends Doctrine_Db_EventListener implements Countable, Ite
             $rand = (mt_rand() / mt_getrandmax());
 
             if ($rand <= $this->_options['addStatsPropability']) {
-                file_put_contents($this->_options['statsFile'], implode("\n", $this->_queries));
+                file_put_contents($this->_options['statsFile'], implode("\n", array_map('serialize', $this->_queries)));
             }
         }
     }
@@ -289,7 +297,7 @@ class Doctrine_Cache extends Doctrine_Db_EventListener implements Countable, Ite
 
             $this->add($query, $event->getInvoker()->getName());
 
-            $data = $this->_driver->fetch(md5($query));
+            $data = $this->_driver->fetch(md5(serialize($query)));
 
             $this->success = ($data) ? true : false;
 
@@ -303,7 +311,7 @@ class Doctrine_Cache extends Doctrine_Db_EventListener implements Countable, Ite
 
                     $this->success = true;
 
-                    $this->_driver->save(md5($query), $data);
+                    $this->_driver->save(md5(serialize($query)), $data);
                 }
             }
             $this->_data = $data;
diff --git a/lib/Doctrine/Column.php b/lib/Doctrine/Column.php
index 48488fd3e..255300c7f 100644
--- a/lib/Doctrine/Column.php
+++ b/lib/Doctrine/Column.php
@@ -36,7 +36,7 @@ class Doctrine_Column extends Doctrine_Access implements IteratorAggregate, Coun
      * @var array $definition
      */
     protected $_definition = array(
-                                'type',
+                                'type' => null,
                                 'length' => 0,
                                 );
     /**
@@ -46,6 +46,22 @@ class Doctrine_Column extends Doctrine_Access implements IteratorAggregate, Coun
     {
         $this->_definition = $definition;
     }
+    /**
+     * @return array
+     */
+    public function getDefinition()
+    {
+        return $this->_definition;
+    }
+    /**
+     * contains
+     *
+     * @return boolean
+     */
+    public function contains($name) 
+    {
+        return isset($this->_definition[$name]);
+    }
     /**
      * get
      *
diff --git a/lib/Doctrine/Db/Statement.php b/lib/Doctrine/Db/Statement.php
index cb8c417a5..13cc79e39 100644
--- a/lib/Doctrine/Db/Statement.php
+++ b/lib/Doctrine/Db/Statement.php
@@ -50,6 +50,10 @@ class Doctrine_Db_Statement implements Doctrine_Adapter_Statement_Interface
     {
         return $this->adapter;
     }
+    public function getStatement()
+    {
+        return $this->stmt;	
+    }
     public function getQuery()
     {
         return $this->stmt->queryString;