Some more performance improvements and caching

application/classes/Database.php

@@ -14,5 +14,12 @@ abstract class Database extends Kohana_Database {
 	// Enable TSM SHOW commands
 	const SHOW =  5;
 	const SET  =  6;
+
+	// We need to set our default database so that any internal calls to Database::instance() use the right database.
+	public static function instance($name = NULL, array $config = NULL) {
+		Database::$default = Kohana::$config->load('config')->client_type;
+
+		return parent::instance($name,$config);
+	}
 }
 ?>