Changeset 4463 for trunk/lib/Doctrine

Timestamp:

06/02/08 12:35:34 (7 months ago)

Author:

zYne

Message:

 

Location:

trunk/lib/Doctrine

Files:

• Connection/Mysql.php (modified) (2 diffs)
• Connection/Sqlite.php (modified) (2 diffs)
• Manager.php (modified) (1 diff)

trunk/lib/Doctrine/Connection/Mysql.php

@@ -45 +45 @@
      * @param PDO|Doctrine_Adapter $adapter     database handler
      */
-    public function __construct(Doctrine_Manager $manager, $adapter)
+    public function __construct($adapter, $user = null, $pass = null)
     {
         $this->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
@@ -88 +88 @@
         $this->properties['varchar_max_length'] = 255;
 
-        parent::__construct($manager, $adapter);
+        parent::__construct($adapter, $user, $pass);
     }
 

trunk/lib/Doctrine/Connection/Sqlite.php

@@ -47 +47 @@
      * @param PDO $pdo                          database handle
      */
-    public function __construct(Doctrine_Manager $manager, $adapter)
+    public function __construct($adapter, $user = null, $pass = null)
     {
         $this->supported = array('sequences'            => 'emulated',
@@ -68 +68 @@
                           'pattern_escaping'     => false,
                           );
-         parent::__construct($manager, $adapter);
+        parent::__construct($adapter, $user, $pass);
 
         if ($this->isConnected) {

trunk/lib/Doctrine/Manager.php

@@ -326 +326 @@
 
         $className = $drivers[$driverName];
-        $conn = new $className($this, $adapter);
+        $conn = new $className($adapter);
         $conn->setName($name);