Changeset 2992

Timestamp:

07/07/2008 08:25:50 PM (3 months ago)

Author:

Shadowhand

Message:

Changed the behavior of Database::instance() to allow named instances, rather than always returning the same instance.

Files:

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

trunk/system/libraries/Database.php

@@ -11 +11 @@
  */
 class Database_Core {
+
+        // Database instances
+        public static $instances = array();
 
         // Global benchmark
@@ -53 +56 @@
          * @return  Database_Core
          */
-        public static function instance($config = array())
-        {
-                static $instance;
-
-                // Create the instance if it does not exist
-                ($instance === NULL) and $instance = new Database($config);
-
-                return $instance;
+        public static function instance($name = 'default', $config = NULL)
+        {
+                if ( ! isset(Database::$instances[$name]))
+                {
+                        // Create a new instance
+                        Database::$instances[$name] = new Database($config === NULL ? $name : $config);
+                }
+
+                return Database::$instances[$name];
         }