Doctrine

Timestamp:

05/09/08 18:48:49 (14 months ago)

Author:

hansbrix

Message:

added exception handling to PDO init in connect() to avoid uncaught PDOException/convert to Doctrine_Exception

Files:

• branches/0.11/lib/Doctrine/Connection.php (modified) (1 diff)

branches/0.11/lib/Doctrine/Connection.php

@@ -453 +453 @@
         if (extension_loaded('pdo')) {
             if (in_array($e[0], PDO::getAvailableDrivers())) {
-                $this->dbh = new PDO($this->options['dsn'], $this->options['username'], 
+                try {
+                    $this->dbh = new PDO($this->options['dsn'], $this->options['username'], 
                                      $this->options['password'], $this->options['other']);
                                      
-                $this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+                    $this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+                } catch (PDOException $e) {
+                        throw new Doctrine_Connection_Exception('PDO Connection Error: ' . $e->getMessage());
+                }
                 $found = true;
             }