Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

database refactoring for dependency injection and other general refactoring.

This commit is contained in:
Taylor Otwell 2011-09-04 21:45:37 -05:00
parent c2f5e7eeb5
commit 3e874867b8
5 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/config/container.php
View File

@ -45,7 +45,7 @@
{
$config = $container->resolve('laravel.config');
return new Database\Manager($config->get('database.connections'), $config->get('database.default'));
return new Database\Manager(new Database\Connector\Factory, $config->get('database.connections'), $config->get('database.default'));
}),

18
laravel/database/connection.php
View File

@ -40,15 +40,19 @@ class Connection {
/**
* Create a new Connection instance.
*
* @param Connector $connector
* @param Query\Factory $factory
* @param Compiler\Factory $compiler
* @param string $name
* @param array $config
* @param Connector $connector
* @return void
*/
public function __construct($name, $config, Connector $connector)
public function __construct(Connector $connector, Query\Factory $query, Query\Compiler\Factory $compiler, $name, $config)
{
$this->name = $name;
$this->query = $query;
$this->config = $config;
$this->compiler = $compiler;
$this->connector = $connector;
}
@ -152,7 +156,7 @@ private function execute(\PDOStatement $statement, $bindings)
*/
public function table($table)
{
return Query\Factory::make($table, $this, Query\Compiler\Factory::make($this));
return $this->query->make($this, $this->compiler->make($this), $table);
}
/**
@ -167,4 +171,12 @@ public function driver()
return $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
}
/**
* Magic Method for dynamically beginning queries on database tables.
*/
public function __call($method, $parameters)
{
return $this->table($method);
}
}

12
laravel/database/manager.php
View File

@ -22,7 +22,7 @@ class Manager {
*
* @var Connector\Factory
*/
protected $factory;
protected $connector;
/**
* The database connection configurations.
@ -41,16 +41,16 @@ class Manager {
/**
* Create a new database manager instance.
*
* @param Connector\Factory $factory
* @param Connector\Factory $connector
* @param array $config
* @param string $default
* @return void
*/
public function __construct(Connector\Factory $factory, $config, $default)
public function __construct(Connector\Factory $connector, $config, $default)
{
$this->config = $config;
$this->factory = $factory;
$this->default = $default;
$this->connector = $connector;
}
/**
@ -73,9 +73,9 @@ public function connection($connection = null)
throw new \Exception("Database connection [$connection] is not defined.");
}
$connector = $this->factory->make($this->config[$connection]);
list($connector, $query, $compiler) = array($this->connector->make($this->config[$connection]), new Query\Factory, new Query\Compiler\Factory);
static::$connections[$connection] = new Connection($connection, $this->config[$connection], $connector);
$this->connections[$connection] = new Connection($connector, $query, $compiler, $connection, $this->config[$connection]);
}
return $this->connections[$connection];

4
laravel/database/query.php
View File

@ -90,12 +90,12 @@ class Query {
/**
* Create a new query instance.
*
* @param string $table
* @param Connection $connection
* @param Compiler $compiler
* @param string $table
* @return void
*/
public function __construct($table, Connection $connection, Query\Compiler $compiler)
public function __construct(Connection $connection, Query\Compiler $compiler, $table)
{
$this->table = $table;
$this->compiler = $compiler;

8
laravel/database/query/factory.php
View File

@ -8,20 +8,20 @@ class Factory {
/**
* Create a new query instance based on the connection driver.
*
* @param string $table
* @param Connection $connection
* @param Compiler $compiler
* @param string $table
* @return Query
*/
public static function make($table, Connection $connection, Compiler $compiler)
public function make(Connection $connection, Compiler $compiler, $table)
{
switch ($connection->driver())
{
case 'pgsql':
return new Postgres($table, $connection, $compiler);
return new Postgres($connection, $compiler, $table);
default:
return new Query($table, $connection, $compiler);
return new Query($connection, $compiler, $table);
}
}