Changeset 1772 for trunk/system/libraries/Database.php

Timestamp:

01/21/2008 10:33:19 AM (12 months ago)

Author:

Geert

Message:

Kohana::auto_load() now throws an exception if the needed file does not exist.

This fixes proper exception handling on all the driver based libraries: Archive, Cache, Database, Image, Payment and Session.
See for example: http://trac.kohanaphp.com/browser/trunk/system/libraries/Session.php?rev=1745#L63

Also changed code and lang files to be more consistent.

Files:

• trunk/system/libraries/Database.php (modified) (2 diffs)

trunk/system/libraries/Database.php

@@ -155 +155 @@
                 {
                         // Set driver name
-                        $driver = 'Database_'.ucfirst($this->config['connection']['type']).'_Driver';
-
-                        // Manually call auto-loading, for proper exception handling
+                        $driver = 'Database_'.ucfirst(strtolower($this->config['connection']['type'])).'_Driver';
+
+                        // Manually autoload so that exceptions can be caught
                         Kohana::auto_load($driver);
-
-                        // Initialize the driver
-                        $this->driver = new $driver($this->config);
                 }
                 catch (Kohana_Exception $e)
@@ -167 +164 @@
                         throw new Kohana_Database_Exception('database.driver_not_supported', $this->config['connection']['type']);
                 }
+
+                // Initialize the driver
+                $this->driver = new $driver($this->config);
 
                 // Validate the driver