Changeset 2033

Timestamp:

02/11/2008 11:13:50 PM (11 months ago)

Author:

Shadowhand

Message:

Better Database instance caching for Model.

Files:

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

trunk/system/libraries/Model.php

@@ -1 +1 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 /**
- * Model class.
+ * Model base class.
  *
  * $Id$
@@ -15 +15 @@
 
         /**
-         * Loads database to $this->db.
+         * Loads or sets the database instance.
+         *
+         * @param   object   Database instance
+         * @return  void
          */
-        public function __construct()
+        public function __construct($database = NULL)
         {
-                // Load the database into the model
-                if (Event::has_run('system.pre_controller'))
+                static $db;
+
+                if (is_object($database) AND ($database instanceof Database))
                 {
-                        $this->db = isset(Kohana::instance()->db) ? Kohana::instance()->db : new Database('default');
+                        // Use the passed database instance
+                        $this->db = $database;
                 }
                 else
                 {
-                        $this->db = new Database('default');
+                        // Load the default database if necessary
+                        ($db === NULL) and $db = new Database('default');
+
+                        // Use the static database
+                        $this->db = $db;
                 }
         }
 
-} // End Model class
+} // End Model