Doctrine

Timestamp:

03/21/08 04:07:44 (16 months ago)

Author:

jwage

Message:

fixes #893

Location:

branches/0.10

Files:

• lib/Doctrine/Connection.php (modified) (1 diff)
• lib/Doctrine/Manager.php (modified) (3 diffs)
• tests/ManagerTestCase.php (modified) (1 diff)

branches/0.10/lib/Doctrine/Connection.php

@@ -215 +215 @@
 
     /**
+     * getOptions
+     *
+     * Get array of all options
+     *
+     * @return void
+     */
+    public function getOptions()
+    {
+      return $this->options;
+    }
+
+    /**
      * getOption
      * 

branches/0.10/lib/Doctrine/Manager.php

@@ -149 +149 @@
     /**
      * getQueryRegistry
+     *
      * lazy-initializes the query registry object and returns it
      *
@@ -155 +156 @@
     public function getQueryRegistry()
     {
-        if ( ! isset($this->_queryRegistry)) {
-           $this->_queryRegistry = new Doctrine_Query_Registry;
-        }
+        if ( ! isset($this->_queryRegistry)) {
+           $this->_queryRegistry = new Doctrine_Query_Registry;
+        }
         return $this->_queryRegistry;
     }
@@ -276 +277 @@
             $driverName = $parts['scheme'];
             $adapter = $parts;
+        }
+
+        if ( ! is_object($adapter)) {
+            $adapter['user']  = urldecode($adapter['user']);
+            $adapter['pass']  = urldecode($adapter['pass']);
+            $adapter['query'] = urldecode($adapter['query']);
+            $adapter['database'] = urldecode($adapter['database']);
+            $adapter['dsn'] = urldecode($adapter['dsn']);
         }
 

branches/0.10/tests/ManagerTestCase.php

@@ -161 +161 @@
     }
     
+    public function testConnectionInformationDecoded()
+    {
+      $dsn = 'mysql://' . urlencode('test/t') . ':' . urlencode('p@ssword') . '@localhost/' . urlencode('db/name');
+
+      $conn = Doctrine_Manager::connection($dsn);
+      $options = $conn->getOptions();
+
+      $this->assertEqual($options['username'], 'test/t');
+      $this->assertEqual($options['password'], 'p@ssword');
+      $this->assertEqual($options['dsn'], 'mysql:host=localhost;dbname=db/name');
+    }
     public function prepareData() { }
     public function prepareTables() { }