From bfc3ea33ca5c8ddc8500b3d2d8857b9f95304417 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Thu, 16 Jul 2015 16:56:13 -0400
Subject: [PATCH] Reorganize drivers into a more modern layout

---
 Query/{Driver => }/Abstract_Driver.php                 | 10 +++++-----
 Query/Abstract_Query_Builder.php                       |  1 -
 Query/{Driver/SQL => }/Abstract_SQL.php                |  2 +-
 Query/{Driver/Util => }/Abstract_Util.php              |  9 ++++-----
 Query/Connection_Manager.php                           |  7 +++++--
 Query/{Driver => }/Driver_Interface.php                |  2 +-
 .../Drivers/Firebird/Driver.php                        |  4 ++--
 .../Drivers/Firebird/Result.php                        |  4 ++--
 .../firebird_sql.php => Query/Drivers/Firebird/SQL.php |  4 ++--
 .../Drivers/Firebird/Util.php                          |  4 ++--
 .../mysql_driver.php => Query/Drivers/Mysql/Driver.php |  4 ++--
 .../mysql/mysql_sql.php => Query/Drivers/Mysql/SQL.php |  4 ++--
 .../mysql_util.php => Query/Drivers/Mysql/Util.php     |  4 ++--
 .../pgsql_driver.php => Query/Drivers/Pgsql/Driver.php |  4 ++--
 .../pgsql/pgsql_sql.php => Query/Drivers/Pgsql/Sql.php |  4 ++--
 .../pgsql_util.php => Query/Drivers/Pgsql/Util.php     |  4 ++--
 .../Drivers/Sqlite/Driver.php                          |  4 ++--
 .../sqlite_sql.php => Query/Drivers/Sqlite/SQL.php     |  4 ++--
 .../sqlite_util.php => Query/Drivers/Sqlite/Util.php   |  4 ++--
 Query/Query_Builder.php                                |  1 -
 Query/Query_Parser.php                                 |  4 ++--
 Query/{Driver/SQL => }/SQL_Interface.php               |  2 +-
 autoload.php                                           |  9 +++------
 tests/core/core.php                                    |  1 +
 tests/databases/firebird/FirebirdTest.php              |  4 ++--
 tests/databases/mysql/MySQLTest.php                    |  6 +++---
 tests/databases/pgsql/PgSQLQBTest.php                  |  2 +-
 tests/databases/pgsql/PgSQLTest.php                    | 10 ++++++----
 tests/databases/sqlite/SQLiteTest.php                  |  8 +++++---
 29 files changed, 66 insertions(+), 64 deletions(-)
 rename Query/{Driver => }/Abstract_Driver.php (98%)
 rename Query/{Driver/SQL => }/Abstract_SQL.php (96%)
 rename Query/{Driver/Util => }/Abstract_Util.php (97%)
 rename Query/{Driver => }/Driver_Interface.php (99%)
 rename drivers/firebird/firebird_driver.php => Query/Drivers/Firebird/Driver.php (99%)
 rename drivers/firebird/firebird_result.php => Query/Drivers/Firebird/Result.php (98%)
 rename drivers/firebird/firebird_sql.php => Query/Drivers/Firebird/SQL.php (98%)
 rename drivers/firebird/firebird_util.php => Query/Drivers/Firebird/Util.php (97%)
 rename drivers/mysql/mysql_driver.php => Query/Drivers/Mysql/Driver.php (93%)
 rename drivers/mysql/mysql_sql.php => Query/Drivers/Mysql/SQL.php (98%)
 rename drivers/mysql/mysql_util.php => Query/Drivers/Mysql/Util.php (97%)
 rename drivers/pgsql/pgsql_driver.php => Query/Drivers/Pgsql/Driver.php (95%)
 rename drivers/pgsql/pgsql_sql.php => Query/Drivers/Pgsql/Sql.php (98%)
 rename drivers/pgsql/pgsql_util.php => Query/Drivers/Pgsql/Util.php (96%)
 rename drivers/sqlite/sqlite_driver.php => Query/Drivers/Sqlite/Driver.php (97%)
 rename drivers/sqlite/sqlite_sql.php => Query/Drivers/Sqlite/SQL.php (98%)
 rename drivers/sqlite/sqlite_util.php => Query/Drivers/Sqlite/Util.php (97%)
 rename Query/{Driver/SQL => }/SQL_Interface.php (98%)

diff --git a/Query/Driver/Abstract_Driver.php b/Query/Abstract_Driver.php
similarity index 98%
rename from Query/Driver/Abstract_Driver.php
rename to Query/Abstract_Driver.php
index 29647bd..1cb518c 100644
--- a/Query/Driver/Abstract_Driver.php
+++ b/Query/Abstract_Driver.php
@@ -13,7 +13,7 @@
 
 // --------------------------------------------------------------------------
 
-namespace Query\Driver;
+namespace Query;
 
 // --------------------------------------------------------------------------
 
@@ -98,10 +98,10 @@ abstract class Abstract_Driver extends \PDO implements Driver_Interface {
 		// Load the sql and util class for the driver
 		$this_class = get_class($this);
 		$ns_array = explode("\\", $this_class);
-		$base_class = array_pop($ns_array);
-		$namespace = implode('\\', $ns_array);
-		$sql_class = "{$namespace}\\SQL\\{$base_class}_SQL";
-		$util_class = "{$namespace}\\Util\\{$base_class}_Util";
+		array_pop($ns_array);
+		$driver = array_pop($ns_array);
+		$sql_class = "\\Query\\Drivers\\{$driver}\\SQL";
+		$util_class = "\\Query\\Drivers\\{$driver}\\Util";
 
 		$this->sql = new $sql_class();
 		$this->util = new $util_class($this);
diff --git a/Query/Abstract_Query_Builder.php b/Query/Abstract_Query_Builder.php
index ac42ae0..88863d1 100644
--- a/Query/Abstract_Query_Builder.php
+++ b/Query/Abstract_Query_Builder.php
@@ -14,7 +14,6 @@
 // --------------------------------------------------------------------------
 
 namespace Query;
-use \Query\Driver\Driver_Interface;
 
 // --------------------------------------------------------------------------
 
diff --git a/Query/Driver/SQL/Abstract_SQL.php b/Query/Abstract_SQL.php
similarity index 96%
rename from Query/Driver/SQL/Abstract_SQL.php
rename to Query/Abstract_SQL.php
index 9b4509a..dce3702 100644
--- a/Query/Driver/SQL/Abstract_SQL.php
+++ b/Query/Abstract_SQL.php
@@ -13,7 +13,7 @@
 
 // --------------------------------------------------------------------------
 
-namespace Query\Driver\SQL;
+namespace Query;
 
 /**
  * parent for database manipulation subclasses
diff --git a/Query/Driver/Util/Abstract_Util.php b/Query/Abstract_Util.php
similarity index 97%
rename from Query/Driver/Util/Abstract_Util.php
rename to Query/Abstract_Util.php
index ed2ff9d..893558c 100644
--- a/Query/Driver/Util/Abstract_Util.php
+++ b/Query/Abstract_Util.php
@@ -13,8 +13,7 @@
 
 // --------------------------------------------------------------------------
 
-namespace Query\Driver\Util;
-use Query\Driver\Driver_Interface;
+namespace Query;
 
 // --------------------------------------------------------------------------
 
@@ -99,7 +98,7 @@ abstract class Abstract_Util {
 
 		return $sql;
 	}
-	
+
 	// --------------------------------------------------------------------------
 
 	/**
@@ -112,7 +111,7 @@ abstract class Abstract_Util {
 	{
 		return 'DROP TABLE IF EXISTS '.$this->get_driver()->quote_table($name);
 	}
-	
+
 
 	// --------------------------------------------------------------------------
 	// ! Abstract Methods
@@ -125,7 +124,7 @@ abstract class Abstract_Util {
 	 * @return string
 	 */
 	abstract public function backup_structure();
-	
+
 	// --------------------------------------------------------------------------
 
 	/**
diff --git a/Query/Connection_Manager.php b/Query/Connection_Manager.php
index fa03ad6..3c23297 100644
--- a/Query/Connection_Manager.php
+++ b/Query/Connection_Manager.php
@@ -121,7 +121,9 @@ final class Connection_Manager {
 	{
 		list($dsn, $dbtype, $params, $options) = $this->parse_params($params);
 
-		$driver = "\\Query\\Driver\\{$dbtype}";
+		$dbtype = ucfirst($dbtype);
+		$driver = "\\Query\\Drivers\\{$dbtype}\\Driver";
+//echo $driver . "\n";
 
 		// Create the database connection
 		$db = ( ! empty($params->user))
@@ -164,9 +166,10 @@ final class Connection_Manager {
 	{
 		$params->type = strtolower($params->type);
 		$dbtype = ($params->type !== 'postgresql') ? $params->type : 'pgsql';
+		$dbtype = ucfirst($dbtype);
 
 		// Make sure the class exists
-		if ( ! class_exists("Query\\Driver\\{$dbtype}"))
+		if ( ! class_exists("\\Query\\Drivers\\{$dbtype}\\Driver"))
 		{
 			throw new BadDBDriverException('Database driver does not exist, or is not supported');
 		}
diff --git a/Query/Driver/Driver_Interface.php b/Query/Driver_Interface.php
similarity index 99%
rename from Query/Driver/Driver_Interface.php
rename to Query/Driver_Interface.php
index fcfc920..4348781 100644
--- a/Query/Driver/Driver_Interface.php
+++ b/Query/Driver_Interface.php
@@ -13,7 +13,7 @@
 
 // --------------------------------------------------------------------------
 
-namespace Query\Driver;
+namespace Query;
 
 /**
  * PDO Interface to implement for database drivers
diff --git a/drivers/firebird/firebird_driver.php b/Query/Drivers/Firebird/Driver.php
similarity index 99%
rename from drivers/firebird/firebird_driver.php
rename to Query/Drivers/Firebird/Driver.php
index 9c0de26..c044c7f 100644
--- a/drivers/firebird/firebird_driver.php
+++ b/Query/Drivers/Firebird/Driver.php
@@ -13,7 +13,7 @@
 
 // --------------------------------------------------------------------------
 
-namespace Query\Driver;
+namespace Query\Drivers\Firebird;
 
 /**
  * Firebird Database class
@@ -23,7 +23,7 @@ namespace Query\Driver;
  * @package Query
  * @subpackage Drivers
  */
-class Firebird extends Abstract_Driver {
+class Driver extends \Query\Abstract_Driver {
 
 	/**
 	 * Reference to the last query executed
diff --git a/drivers/firebird/firebird_result.php b/Query/Drivers/Firebird/Result.php
similarity index 98%
rename from drivers/firebird/firebird_result.php
rename to Query/Drivers/Firebird/Result.php
index 95bff74..21a0770 100644
--- a/drivers/firebird/firebird_result.php
+++ b/Query/Drivers/Firebird/Result.php
@@ -13,7 +13,7 @@
 
 // --------------------------------------------------------------------------
 
-namespace Query\Driver;
+namespace Query\Drivers\Firebird;
 
 /**
  * Firebird result class to emulate PDOStatement Class - only implements
@@ -22,7 +22,7 @@ namespace Query\Driver;
  * @package Query
  * @subpackage Drivers
  */
-class Firebird_Result extends \PDOStatement {
+class Result extends \PDOStatement {
 
 	/**
 	 * Reference to fbird resource
diff --git a/drivers/firebird/firebird_sql.php b/Query/Drivers/Firebird/SQL.php
similarity index 98%
rename from drivers/firebird/firebird_sql.php
rename to Query/Drivers/Firebird/SQL.php
index a49cff1..addeb86 100644
--- a/drivers/firebird/firebird_sql.php
+++ b/Query/Drivers/Firebird/SQL.php
@@ -13,7 +13,7 @@
 
 // --------------------------------------------------------------------------
 
-namespace Query\Driver\SQL;
+namespace Query\Drivers\Firebird;
 
 /**
  * Firebird Specific SQL
@@ -21,7 +21,7 @@ namespace Query\Driver\SQL;
  * @package Query
  * @subpackage Drivers
  */
-class Firebird_SQL extends Abstract_SQL {
+class SQL extends \Query\Abstract_SQL {
 
 	/**
 	 * Limit clause
diff --git a/drivers/firebird/firebird_util.php b/Query/Drivers/Firebird/Util.php
similarity index 97%
rename from drivers/firebird/firebird_util.php
rename to Query/Drivers/Firebird/Util.php
index 9bde2cb..669e958 100644
--- a/drivers/firebird/firebird_util.php
+++ b/Query/Drivers/Firebird/Util.php
@@ -13,7 +13,7 @@
 
 // --------------------------------------------------------------------------
 
-namespace Query\Driver\Util;
+namespace Query\Drivers\Util;
 
 /**
  * Firebird-specific backup, import and creation methods
@@ -21,7 +21,7 @@ namespace Query\Driver\Util;
  * @package Query
  * @subpackage Drivers
  */
-class Firebird_Util extends Abstract_Util {
+class Firebird extends \Query\Abstract_Util {
 
 	/**
 	 * Convenience public function to generate sql for creating a db table
diff --git a/drivers/mysql/mysql_driver.php b/Query/Drivers/Mysql/Driver.php
similarity index 93%
rename from drivers/mysql/mysql_driver.php
rename to Query/Drivers/Mysql/Driver.php
index 391eeec..af8fb13 100644
--- a/drivers/mysql/mysql_driver.php
+++ b/Query/Drivers/Mysql/Driver.php
@@ -13,7 +13,7 @@
 
 // --------------------------------------------------------------------------
 
-namespace Query\Driver;
+namespace Query\Drivers\Mysql;
 
 /**
  * MySQL specific class
@@ -21,7 +21,7 @@ namespace Query\Driver;
  * @package Query
  * @subpackage Drivers
  */
-class MySQL extends Abstract_Driver {
+class Driver extends \Query\Abstract_Driver {
 
 	/**
 	 * Set the backtick as the MySQL escape character
diff --git a/drivers/mysql/mysql_sql.php b/Query/Drivers/Mysql/SQL.php
similarity index 98%
rename from drivers/mysql/mysql_sql.php
rename to Query/Drivers/Mysql/SQL.php
index ca865f7..79537cb 100644
--- a/drivers/mysql/mysql_sql.php
+++ b/Query/Drivers/Mysql/SQL.php
@@ -13,7 +13,7 @@
 
 // --------------------------------------------------------------------------
 
-namespace Query\Driver\SQL;
+namespace Query\Drivers\Mysql;
 
 /**
  * MySQL specifc SQL
@@ -21,7 +21,7 @@ namespace Query\Driver\SQL;
  * @package Query
  * @subpackage Drivers
  */
-class MySQL_SQL extends Abstract_SQL {
+class SQL extends \Query\Abstract_SQL {
 
 	/**
 	 * Limit clause
diff --git a/drivers/mysql/mysql_util.php b/Query/Drivers/Mysql/Util.php
similarity index 97%
rename from drivers/mysql/mysql_util.php
rename to Query/Drivers/Mysql/Util.php
index 0c66fb6..e505a8a 100644
--- a/drivers/mysql/mysql_util.php
+++ b/Query/Drivers/Mysql/Util.php
@@ -13,7 +13,7 @@
 
 // --------------------------------------------------------------------------
 
-namespace Query\Driver\Util;
+namespace Query\Drivers\Mysql;
 
 /**
  * MySQL-specific backup, import and creation methods
@@ -21,7 +21,7 @@ namespace Query\Driver\Util;
  * @package Query
  * @subpackage Drivers
  */
-class MySQL_Util extends Abstract_Util {
+class Util extends \Query\Abstract_Util {
 
 	/**
 	 * Create an SQL backup file for the current database's structure
diff --git a/drivers/pgsql/pgsql_driver.php b/Query/Drivers/Pgsql/Driver.php
similarity index 95%
rename from drivers/pgsql/pgsql_driver.php
rename to Query/Drivers/Pgsql/Driver.php
index 8304753..070c89a 100644
--- a/drivers/pgsql/pgsql_driver.php
+++ b/Query/Drivers/Pgsql/Driver.php
@@ -13,7 +13,7 @@
 
 // --------------------------------------------------------------------------
 
-namespace Query\Driver;
+namespace Query\Drivers\Pgsql;
 
 /**
  * PostgreSQL specifc class
@@ -21,7 +21,7 @@ namespace Query\Driver;
  * @package Query
  * @subpackage Drivers
  */
-class PgSQL extends Abstract_Driver {
+class Driver extends \Query\Abstract_Driver {
 
 	/**
 	 * Connect to a PosgreSQL database
diff --git a/drivers/pgsql/pgsql_sql.php b/Query/Drivers/Pgsql/Sql.php
similarity index 98%
rename from drivers/pgsql/pgsql_sql.php
rename to Query/Drivers/Pgsql/Sql.php
index db9c46a..f002583 100644
--- a/drivers/pgsql/pgsql_sql.php
+++ b/Query/Drivers/Pgsql/Sql.php
@@ -12,7 +12,7 @@
 
 // --------------------------------------------------------------------------
 
-namespace Query\Driver\SQL;
+namespace Query\Drivers\Pgsql;
 
 /**
  * PostgreSQL specifc SQL
@@ -20,7 +20,7 @@ namespace Query\Driver\SQL;
  * @package Query
  * @subpackage Drivers
  */
-class PgSQL_SQL extends Abstract_SQL {
+class SQL extends \Query\Abstract_SQL {
 
 	/**
 	 * Get the query plan for the sql query
diff --git a/drivers/pgsql/pgsql_util.php b/Query/Drivers/Pgsql/Util.php
similarity index 96%
rename from drivers/pgsql/pgsql_util.php
rename to Query/Drivers/Pgsql/Util.php
index cf3303c..60eafc7 100644
--- a/drivers/pgsql/pgsql_util.php
+++ b/Query/Drivers/Pgsql/Util.php
@@ -13,7 +13,7 @@
 
 // --------------------------------------------------------------------------
 
-namespace Query\Driver\Util;
+namespace Query\Drivers\Pgsql;
 
 /**
  * Posgres-specific backup, import and creation methods
@@ -21,7 +21,7 @@ namespace Query\Driver\Util;
  * @package Query
  * @subpackage Drivers
  */
-class PgSQL_Util extends Abstract_Util {
+class Util extends \Query\Abstract_Util {
 
 	/**
 	 * Create an SQL backup file for the current database's structure
diff --git a/drivers/sqlite/sqlite_driver.php b/Query/Drivers/Sqlite/Driver.php
similarity index 97%
rename from drivers/sqlite/sqlite_driver.php
rename to Query/Drivers/Sqlite/Driver.php
index 48e6de3..648033c 100644
--- a/drivers/sqlite/sqlite_driver.php
+++ b/Query/Drivers/Sqlite/Driver.php
@@ -13,7 +13,7 @@
 
 // --------------------------------------------------------------------------
 
-namespace Query\Driver;
+namespace Query\Drivers\Sqlite;
 
 /**
  * SQLite specific class
@@ -21,7 +21,7 @@ namespace Query\Driver;
  * @package Query
  * @subpackage Drivers
  */
-class SQLite extends Abstract_Driver {
+class Driver extends \Query\Abstract_Driver {
 
 	/**
 	 * Reference to the last executed sql query
diff --git a/drivers/sqlite/sqlite_sql.php b/Query/Drivers/Sqlite/SQL.php
similarity index 98%
rename from drivers/sqlite/sqlite_sql.php
rename to Query/Drivers/Sqlite/SQL.php
index 1ace4a1..61f5bb8 100644
--- a/drivers/sqlite/sqlite_sql.php
+++ b/Query/Drivers/Sqlite/SQL.php
@@ -13,7 +13,7 @@
 
 // --------------------------------------------------------------------------
 
-namespace Query\Driver\SQL;
+namespace Query\Drivers\Sqlite;
 
 /**
  * SQLite Specific SQL
@@ -21,7 +21,7 @@ namespace Query\Driver\SQL;
  * @package Query
  * @subpackage Drivers
  */
-class SQLite_SQL extends Abstract_SQL {
+class SQL extends \Query\Abstract_SQL {
 
 	/**
 	 * Get the query plan for the sql query
diff --git a/drivers/sqlite/sqlite_util.php b/Query/Drivers/Sqlite/Util.php
similarity index 97%
rename from drivers/sqlite/sqlite_util.php
rename to Query/Drivers/Sqlite/Util.php
index fc44fbd..75b97fb 100644
--- a/drivers/sqlite/sqlite_util.php
+++ b/Query/Drivers/Sqlite/Util.php
@@ -13,7 +13,7 @@
 
 // --------------------------------------------------------------------------
 
-namespace Query\Driver\Util;
+namespace Query\Drivers\Sqlite;
 
 /**
  * SQLite-specific backup, import and creation methods
@@ -23,7 +23,7 @@ namespace Query\Driver\Util;
  * @method mixed query(string $sql)
  * @method string quote(string $str)
  */
-class SQLite_Util extends Abstract_Util {
+class Util extends \Query\Abstract_Util {
 
 	/**
 	 * Create an SQL backup file for the current database's data
diff --git a/Query/Query_Builder.php b/Query/Query_Builder.php
index b5b4ecc..e850f00 100644
--- a/Query/Query_Builder.php
+++ b/Query/Query_Builder.php
@@ -14,7 +14,6 @@
 // --------------------------------------------------------------------------
 
 namespace Query;
-use Query\Driver\Driver_Interface;
 
 // --------------------------------------------------------------------------
 
diff --git a/Query/Query_Parser.php b/Query/Query_Parser.php
index 3c6a2f9..fa66afc 100644
--- a/Query/Query_Parser.php
+++ b/Query/Query_Parser.php
@@ -58,7 +58,7 @@ class Query_Parser {
 	 *
 	 * @param Driver\Driver_Interface $db
 	 */
-	public function __construct(Driver\Driver_Interface $db)
+	public function __construct(Driver_Interface $db)
 	{
 		$this->db = $db;
 	}
@@ -84,7 +84,7 @@ class Query_Parser {
 
 		// Go through the matches, and get the most relevant matches
 		$this->matches = array_map(array($this, 'filter_array'), $this->matches);
-		
+
 		return $this->matches;
 	}
 
diff --git a/Query/Driver/SQL/SQL_Interface.php b/Query/SQL_Interface.php
similarity index 98%
rename from Query/Driver/SQL/SQL_Interface.php
rename to Query/SQL_Interface.php
index 6ee0896..65519db 100644
--- a/Query/Driver/SQL/SQL_Interface.php
+++ b/Query/SQL_Interface.php
@@ -13,7 +13,7 @@
 
 // --------------------------------------------------------------------------
 
-namespace Query\Driver\SQL;
+namespace Query;
 
 /**
  * parent for database manipulation subclasses
diff --git a/autoload.php b/autoload.php
index b35c2a3..036e4bc 100644
--- a/autoload.php
+++ b/autoload.php
@@ -39,7 +39,7 @@ require(QBASE_PATH.'common.php');
 // Load Query Classes
 spl_autoload_register(function ($class)
 {
-	$class_segments = explode('\\', $class);
+	/*$class_segments = explode('\\', $class);
 	$driver_class = strtolower(array_pop($class_segments));
 
 	// Load DB Driver classes
@@ -49,15 +49,12 @@ spl_autoload_register(function ($class)
 
 		// Firebird is a special case, since it's not a PDO driver
 		// @codeCoverageIgnoreStart
-		if (
-			in_array($driver_class, \PDO::getAvailableDrivers())
-			||  function_exists('\\fbird_connect') && $driver_class === 'firebird'
-		)
+		if (function_exists('\\fbird_connect') && $driver_class === 'firebird')
 		{
 			array_map('\\do_include', glob("{$driver_path}/*.php"));
 		}
 		// @codeCoverageIgnoreEnd
-	}
+	}*/
 
 	// Load other classes
 	$path = str_replace('\\', DIRECTORY_SEPARATOR, $class);
diff --git a/tests/core/core.php b/tests/core/core.php
index 134f131..ef41945 100644
--- a/tests/core/core.php
+++ b/tests/core/core.php
@@ -59,6 +59,7 @@ class CoreTest extends Query_TestCase {
 
 		// Make sure at least one of the supported drivers is enabled
 		$supported = array(
+			'firebird',
 			'mysql',
 			'pgsql',
 			'odbc',
diff --git a/tests/databases/firebird/FirebirdTest.php b/tests/databases/firebird/FirebirdTest.php
index 16ff1f6..6ba1faf 100644
--- a/tests/databases/firebird/FirebirdTest.php
+++ b/tests/databases/firebird/FirebirdTest.php
@@ -33,7 +33,7 @@ class FirebirdTest extends DBtest {
 		}
 
 		// test the db driver directly
-		$this->db = new \Query\Driver\Firebird('localhost:'.$dbpath);
+		$this->db = new \Query\Drivers\Firebird\Driver('localhost:'.$dbpath);
 		$this->db->table_prefix = 'create_';
 		$this->tables = $this->db->get_tables();
 	}
@@ -75,7 +75,7 @@ class FirebirdTest extends DBtest {
 
 	public function testConnection()
 	{
-		$this->assertIsA($this->db, '\\Query\\Driver\\Firebird');
+		$this->assertIsA($this->db, '\\Query\\Drivers\\Firebird\\Driver');
 	}
 
 	// --------------------------------------------------------------------------
diff --git a/tests/databases/mysql/MySQLTest.php b/tests/databases/mysql/MySQLTest.php
index e06f4a1..2e42946 100644
--- a/tests/databases/mysql/MySQLTest.php
+++ b/tests/databases/mysql/MySQLTest.php
@@ -29,13 +29,13 @@ class MySQLTest extends DBTest {
 			$params = json_decode(file_get_contents(QTEST_DIR . "/settings.json"));
 			$params = $params->mysql;
 
-			$this->db = new \Query\Driver\MySQL("mysql:host={$params->host};dbname={$params->database}", $params->user, $params->pass, array(
+			$this->db = new \Query\Drivers\Mysql\Driver("mysql:host={$params->host};dbname={$params->database}", $params->user, $params->pass, array(
 				PDO::ATTR_PERSISTENT => TRUE
 			));
 		}
 		elseif (($var = getenv('CI')))
 		{
-			$this->db = new \Query\Driver\MySQL('host=127.0.0.1;port=3306;dbname=test', 'root');
+			$this->db = new \Query\Drivers\Mysql\Driver('host=127.0.0.1;port=3306;dbname=test', 'root');
 		}
 
 		$this->db->table_prefix = 'create_';
@@ -52,7 +52,7 @@ class MySQLTest extends DBTest {
 
 	public function testConnection()
 	{
-		$this->assertIsA($this->db, '\\Query\\Driver\\MySQL');
+		$this->assertIsA($this->db, '\\Query\\Drivers\\Mysql\\Driver');
 	}
 
 	// --------------------------------------------------------------------------
diff --git a/tests/databases/pgsql/PgSQLQBTest.php b/tests/databases/pgsql/PgSQLQBTest.php
index 3477a16..9706abd 100644
--- a/tests/databases/pgsql/PgSQLQBTest.php
+++ b/tests/databases/pgsql/PgSQLQBTest.php
@@ -20,7 +20,7 @@ class PgSQLQBTest extends QBTest {
 	public function setUp()
  	{
  		// If the database isn't installed, skip the tests
-		if ( ! class_exists("Query\\Driver\\PgSQL") &&  ! IS_QUERCUS)
+		if ( ! class_exists("Query\\Drivers\\Pgsql\\Driver") &&  ! IS_QUERCUS)
 		{
 			$this->markTestSkipped("Postgres extension for PDO not loaded");
 		}
diff --git a/tests/databases/pgsql/PgSQLTest.php b/tests/databases/pgsql/PgSQLTest.php
index 284feab..0c2b972 100644
--- a/tests/databases/pgsql/PgSQLTest.php
+++ b/tests/databases/pgsql/PgSQLTest.php
@@ -22,10 +22,10 @@ class PgTest extends DBTest {
 
 	public function setUp()
 	{
-		$class = "Query\\Driver\\PgSQL";
+		$class = "Query\\Drivers\\Pgsql\\Driver";
 
 		// If the database isn't installed, skip the tests
-		if ( ! class_exists($class) && ! IS_QUERCUS)
+		if (( ! class_exists($class)) && ! IS_QUERCUS)
 		{
 			$this->markTestSkipped("Postgres extension for PDO not loaded");
 		}
@@ -50,7 +50,9 @@ class PgTest extends DBTest {
 
 	public function testExists()
 	{
-		$this->assertTrue(in_array('pgsql', PDO::getAvailableDrivers()));
+		$drivers = \PDO::getAvailableDrivers();
+print_r($drivers);
+		$this->assertTrue(in_array('pgsql', $drivers));
 	}
 
 	// --------------------------------------------------------------------------
@@ -59,7 +61,7 @@ class PgTest extends DBTest {
 	{
 		if (empty($this->db))  return;
 
-		$this->assertIsA($this->db, '\\Query\\Driver\\PgSQL');
+		$this->assertIsA($this->db, '\\Query\\Drivers\\Pgsql\\Driver');
 	}
 
 	// --------------------------------------------------------------------------
diff --git a/tests/databases/sqlite/SQLiteTest.php b/tests/databases/sqlite/SQLiteTest.php
index 4f5cc35..3d93c3d 100644
--- a/tests/databases/sqlite/SQLiteTest.php
+++ b/tests/databases/sqlite/SQLiteTest.php
@@ -162,10 +162,12 @@ SQL;
 
 	public function testConnection()
 	{
-		$db = new \Query\Driver\SQLite(QTEST_DIR.QDS.'db_files'.QDS.'test_sqlite.db');
+		$class = '\\Query\\Drivers\\Sqlite\\Driver';
 
-		$this->assertIsA($db, '\\Query\\Driver\\SQLite');
-		$this->assertIsA($this->db->db, '\\Query\\Driver\\SQLite');
+		$db = new $class(QTEST_DIR.QDS.'db_files'.QDS.'test_sqlite.db');
+
+		$this->assertIsA($db, $class);
+		$this->assertIsA($this->db->db, $class);
 
 		unset($db);
 	}