From 2521ab3c1d7f3056bfd82774d754285e00249954 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Sun, 11 Sep 2011 23:25:31 -0500
Subject: [PATCH] refactoring the database layer.

---
 laravel/database/connector/callback.php            |  2 --
 laravel/database/{ => connector}/connector.php     |  2 +-
 laravel/database/connector/mysql.php               |  4 ++--
 laravel/database/connector/postgres.php            |  4 ++--
 laravel/database/connector/sqlite.php              |  8 ++++----
 laravel/database/query/{ => compiler}/compiler.php |  2 +-
 laravel/database/query/compiler/factory.php        |  1 -
 laravel/database/query/compiler/mysql.php          |  2 --
 laravel/database/query/compiler/postgres.php       |  2 --
 laravel/database/query/factory.php                 |  1 -
 laravel/database/query/postgres.php                |  4 ++--
 laravel/database/{ => query}/query.php             | 12 +++++++-----
 12 files changed, 19 insertions(+), 25 deletions(-)
 rename laravel/database/{ => connector}/connector.php (92%)
 rename laravel/database/query/{ => compiler}/compiler.php (99%)
 rename laravel/database/{ => query}/query.php (98%)

diff --git a/laravel/database/connector/callback.php b/laravel/database/connector/callback.php
index 19c08078..860a8cfc 100644
--- a/laravel/database/connector/callback.php
+++ b/laravel/database/connector/callback.php
@@ -1,7 +1,5 @@
 <?php namespace Laravel\Database\Connector;
 
-use Laravel\Database\Connector;
-
 class Callback extends Connector {
 
 	/**
diff --git a/laravel/database/connector.php b/laravel/database/connector/connector.php
similarity index 92%
rename from laravel/database/connector.php
rename to laravel/database/connector/connector.php
index 6f7c3db0..bbcb12eb 100644
--- a/laravel/database/connector.php
+++ b/laravel/database/connector/connector.php
@@ -1,4 +1,4 @@
-<?php namespace Laravel\Database;
+<?php namespace Laravel\Database\Connector;
 
 use PDO;
 
diff --git a/laravel/database/connector/mysql.php b/laravel/database/connector/mysql.php
index 0647eea6..929769a5 100644
--- a/laravel/database/connector/mysql.php
+++ b/laravel/database/connector/mysql.php
@@ -1,6 +1,6 @@
 <?php namespace Laravel\Database\Connector;
 
-use Laravel\Database\Connector;
+use PDO;
 
 class MySQL extends Connector {
 
@@ -24,7 +24,7 @@ public function connect($config)
 			$dsn .= ';unix_socket='.$config['socket'];
 		}
 
-		$connection = new \PDO($dsn, $config['username'], $config['password'], $this->options);
+		$connection = new PDO($dsn, $config['username'], $config['password'], $this->options);
 
 		if (isset($config['charset']))
 		{
diff --git a/laravel/database/connector/postgres.php b/laravel/database/connector/postgres.php
index 6e445cbc..0ec4db1c 100644
--- a/laravel/database/connector/postgres.php
+++ b/laravel/database/connector/postgres.php
@@ -1,6 +1,6 @@
 <?php namespace Laravel\Database\Connector;
 
-use Laravel\Database\Connector;
+use PDO;
 
 class Postgres extends Connector {
 
@@ -19,7 +19,7 @@ public function connect($config)
 			$dsn .= ';port='.$config['port'];
 		}
 
-		$connection = new \PDO($dsn, $config['username'], $config['password'], $this->options);
+		$connection = new PDO($dsn, $config['username'], $config['password'], $this->options);
 
 		if (isset($config['charset']))
 		{
diff --git a/laravel/database/connector/sqlite.php b/laravel/database/connector/sqlite.php
index 300ab658..8c6d7015 100644
--- a/laravel/database/connector/sqlite.php
+++ b/laravel/database/connector/sqlite.php
@@ -1,6 +1,6 @@
 <?php namespace Laravel\Database\Connector;
 
-use Laravel\Database\Connector;
+use PDO;
 
 class SQLite extends Connector {
 
@@ -14,15 +14,15 @@ public function connect($config)
 	{
 		if ($config['database'] == ':memory:')
 		{
-			return new \PDO('sqlite::memory:', null, null, $this->options);
+			return new PDO('sqlite::memory:', null, null, $this->options);
 		}
 		elseif (file_exists($path = DATABASE_PATH.$config['database'].'.sqlite'))
 		{
-			return new \PDO('sqlite:'.$path, null, null, $this->options);
+			return new PDO('sqlite:'.$path, null, null, $this->options);
 		}
 		elseif (file_exists($config['database']))
 		{
-			return new \PDO('sqlite:'.$config['database'], null, null, $this->options);
+			return new PDO('sqlite:'.$config['database'], null, null, $this->options);
 		}
 
 		throw new \Exception("SQLite database [".$config['database']."] could not be found.");
diff --git a/laravel/database/query/compiler.php b/laravel/database/query/compiler/compiler.php
similarity index 99%
rename from laravel/database/query/compiler.php
rename to laravel/database/query/compiler/compiler.php
index 0e86a97a..a0efe929 100644
--- a/laravel/database/query/compiler.php
+++ b/laravel/database/query/compiler/compiler.php
@@ -1,4 +1,4 @@
-<?php namespace Laravel\Database\Query;
+<?php namespace Laravel\Database\Query\Compiler;
 
 use Laravel\Database\Query;
 
diff --git a/laravel/database/query/compiler/factory.php b/laravel/database/query/compiler/factory.php
index 3fca1798..1b3d3500 100644
--- a/laravel/database/query/compiler/factory.php
+++ b/laravel/database/query/compiler/factory.php
@@ -1,7 +1,6 @@
 <?php namespace Laravel\Database\Query\Compiler;
 
 use Laravel\Database\Connection;
-use Laravel\Database\Query\Compiler;
 
 class Factory {
 
diff --git a/laravel/database/query/compiler/mysql.php b/laravel/database/query/compiler/mysql.php
index 97141dcc..7dd79682 100644
--- a/laravel/database/query/compiler/mysql.php
+++ b/laravel/database/query/compiler/mysql.php
@@ -1,7 +1,5 @@
 <?php namespace Laravel\Database\Query\Compiler;
 
-use Laravel\Database\Query\Compiler;
-
 class MySQL extends Compiler {
 
 	/**
diff --git a/laravel/database/query/compiler/postgres.php b/laravel/database/query/compiler/postgres.php
index 141205f9..b69c1e5b 100644
--- a/laravel/database/query/compiler/postgres.php
+++ b/laravel/database/query/compiler/postgres.php
@@ -1,7 +1,5 @@
 <?php namespace Laravel\Database\Query\Compiler;
 
-use Laravel\Database\Query\Compiler;
-
 class Postgres extends Compiler {
 
 	/**
diff --git a/laravel/database/query/factory.php b/laravel/database/query/factory.php
index d7fd4c13..477937ab 100644
--- a/laravel/database/query/factory.php
+++ b/laravel/database/query/factory.php
@@ -1,6 +1,5 @@
 <?php namespace Laravel\Database\Query;
 
-use Laravel\Database\Query;
 use Laravel\Database\Connection;
 
 class Factory {
diff --git a/laravel/database/query/postgres.php b/laravel/database/query/postgres.php
index 83c9487f..e23869b9 100644
--- a/laravel/database/query/postgres.php
+++ b/laravel/database/query/postgres.php
@@ -1,6 +1,6 @@
 <?php namespace Laravel\Database\Query;
 
-use Laravel\Database\Query;
+use PDO;
 
 class Postgres extends Query {
 
@@ -16,7 +16,7 @@ public function insert_get_id($values)
 
 		$query->execute(array_values($values));
 
-		return (int) $query->fetch(\PDO::FETCH_CLASS, 'stdClass')->id;
+		return (int) $query->fetch(PDO::FETCH_CLASS, 'stdClass')->id;
 	}
 
 }
\ No newline at end of file
diff --git a/laravel/database/query.php b/laravel/database/query/query.php
similarity index 98%
rename from laravel/database/query.php
rename to laravel/database/query/query.php
index 44939856..494047fb 100644
--- a/laravel/database/query.php
+++ b/laravel/database/query/query.php
@@ -1,4 +1,6 @@
-<?php namespace Laravel\Database;
+<?php namespace Laravel\Database\Query;
+
+use Laravel\Database\Connection;
 
 class Query {
 
@@ -90,12 +92,12 @@ class Query {
 	/**
 	 * Create a new query instance.
 	 *
-	 * @param  Connection  $connection
-	 * @param  Compiler    $compiler
-	 * @param  string      $table
+	 * @param  Database\Connection  $connection
+	 * @param  Compiler             $compiler
+	 * @param  string               $table
 	 * @return void
 	 */
-	public function __construct(Connection $connection, Query\Compiler $compiler, $table)
+	public function __construct(Connection $connection, Compiler\Compiler $compiler, $table)
 	{
 		$this->table = $table;
 		$this->compiler = $compiler;