Changeset 3146

Timestamp:

05/03/08 15:45:27 (2 months ago)

Author:

pmjones

Message:

Solar_Sql_Adapter: [FIX] Fixes cache conflicts across multiple connections. Patch from Rodrigo Moraes; thanks, Rodrigo. :-)

Files:

• trunk/Solar/Sql/Adapter.php (modified) (3 diffs)

trunk/Solar/Sql/Adapter.php

@@ -235 +235 @@
-     */
-    protected $_profiling = false;
+
+    /**
+     * 
+     * A PDO-style DSN, for example, "mysql:host=127.0.0.1;dbname=test"
+     * 
+     * @var string
+     * 
+     */
+    protected $_dsn;
-    
-    /**
@@ -248 +257 @@
-        $this->_cache = Solar::dependency('Solar_Cache', $this->_config['cache']);
-        $this->setProfiling($this->_config['profiling']);
+        
+        // build a DSN
+        $this->_dsn = $this->_dsn();
+        
+        // save the cache-key prefix
+        $this->_cache_key_prefix = get_class($this) . '/' . md5($this->_dsn);
-    }
-    
@@ -343 +358 @@
-        $before = microtime(true);
-        
-        // build a DSN
-        $dsn = $this->_dsn();
-        
-        // save the cache-key prefix
-        $this->_cache_key_prefix = get_class($this) . '/' . md5($dsn);
-        
-        // attempt the connection
-        $this->_pdo = new PDO(
-
+this->_
-            $this->_config['user'],
-            $this->_config['pass']