From 893acd8743eab2080148aab4b253e15c2460619f Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Sat, 15 Oct 2011 23:20:13 -0500
Subject: [PATCH] tweaking and refactoring the database connectors. added
 connectors to the container.

---
 laravel/config/container.php | 27 +++++++++++++++++++++++++++
 laravel/database/manager.php | 22 ++++------------------
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/laravel/config/container.php b/laravel/config/container.php
index 40865340..e82839f6 100644
--- a/laravel/config/container.php
+++ b/laravel/config/container.php
@@ -39,6 +39,33 @@ return array(
 		return new Routing\Caller($c, require APP_PATH.'filters'.EXT, CONTROLLER_PATH);
 	}),
 
+	/*
+	|--------------------------------------------------------------------------
+	| Laravel Database Connectors
+	|--------------------------------------------------------------------------
+	|
+	| The following components are used to establish PDO database connections
+	| to the various database systems supported by Laravel. By resolving these
+	| connectors out of the IoC container, new database systems may be added
+	| by simply registering a connector.
+	|
+	*/
+
+	'laravel.database.connectors.sqlite' => function($c)
+	{
+		return new Database\Connectors\SQLite;
+	},
+
+	'laravel.database.connectors.mysql' => function($c)
+	{
+		return new Database\Connectors\MySQL;
+	},
+
+	'laravel.database.connectors.pgsql' => function($c)
+	{
+		return new Database\Connectors\Postgres;
+	},
+
 	/*
 	|--------------------------------------------------------------------------
 	| Laravel Caching Components
diff --git a/laravel/database/manager.php b/laravel/database/manager.php
index 953426c8..835d1aaa 100644
--- a/laravel/database/manager.php
+++ b/laravel/database/manager.php
@@ -1,5 +1,6 @@
 <?php namespace Laravel\Database;
 
+use Laravel\IoC;
 use Laravel\Config;
 
 class Manager {
@@ -56,27 +57,12 @@ class Manager {
 	 */
 	protected static function connect($config)
 	{
-		if (isset($config['connector'])) { return call_user_func($config['connector'], $config); }
-
-		switch ($config['driver'])
+		if (isset($config['connector']))
 		{
-			case 'sqlite':
-				$connector = new Connectors\SQLite;
-				break;
-
-			case 'mysql':
-				$connector = new Connectors\MySQL;
-				break;
-
-			case 'pgsql':
-				$connector = new Connectors\Postgres;
-				break;
-
-			default:
-				throw new \Exception("Database driver [{$config['driver']}] is not supported.");
+			return call_user_func($config['connector'], $config);
 		}
 
-		return $connector->connect($config);
+		return IoC::container()->core("database.connectors.{$config['driver']}")->connect($config);
 	}
 
 	/**