Autoloader, and beginning of simplified testing

.gitignore

@@ -1 +1,2 @@
 test_config.json
+tests/simpletest/*

README.md

@@ -14,6 +14,11 @@ A query builder/abstraction layer, using prepared queries for security.
 * SQLite
 * Others, via ODBC
 
+## Including Query in your application
+
+To include Query in your PHP project, just include the `autoload.php` file. This will automatically load the classes that are supported by the current PHP installation.
+
+	
 ## Connecting
 
 Create a connection array or object similar to this:

autoload.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * Query
+ *
+ * Free Query Builder / Database Abstraction Layer
+ *
+ * @author 		Timothy J. Warren
+ * @copyright	Copyright (c) 2012
+ * @link 		https://github.com/aviat4ion/Query
+ * @license 	http://philsturgeon.co.uk/code/dbad-license 
+ */
+
+// --------------------------------------------------------------------------
+
+/**
+ * Autoloader for loading available database classes
+ *
+ */
+
+define('BASE_PATH', dirname(__FILE__).'/');
+define('DRIVER_PATH', BASE_PATH.'drivers/');
+
+// Load base classes
+require_once(BASE_PATH.'db_pdo.php');
+require_once(BASE_PATH.'query_builder.php');
+
+// Load PDO Drivers
+foreach(pdo_drivers() as $d)
+{
+	$f = DRIVER_PATH.$d.'.php';
+	$fsql = DRIVER_PATH.$d."_sql.php";
+
+	if(is_file($f) && $f !== 'firebird')
+	{
+		require_once($f);
+		require_once($fsql);
+	}
+}
+
+// Load Firebird driver, if applicable
+if (function_exists('fbird_connect'))
+{
+	require_once(DRIVER_PATH.'firebird.php');
+	require_once(DRIVER_PATH.'firebird_sql.php');
+}
+
+// End of autoload.php

tests/databases/firebird-qb.php

@@ -15,7 +15,7 @@
 /**
  * Firebird Query Builder Tests
  */
-class FirebirdQBTest extends UnitTestCase {
+class FirebirdQBTest extends QBTest {
 
 	function __construct()
 	{

tests/databases/mysql-qb.php

@@ -12,7 +12,7 @@
 
 // --------------------------------------------------------------------------
 
-class MySQLQBTest extends UnitTestCase {
+class MySQLQBTest extends QBTest {
 
 	function __construct()
  	{

tests/databases/pgsql-qb.php

@@ -12,7 +12,7 @@
 
 // --------------------------------------------------------------------------
 
-class PgSQLQBTest extends UnitTestCase {
+class PgSQLQBTest extends QBTest {
 
 	function __construct()
  	{
@@ -32,214 +32,8 @@ class PgSQLQBTest extends UnitTestCase {
 		}
  	}
 	
-	
 	function TestExists()
 	{
 		$this->assertTrue(in_array('pgsql', pdo_drivers()));
 	}
-	
-	function TestGet()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->get('create_test');
-		
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestGetLimit()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->get('create_test', 2);
-		
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestGetLimitSkip()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->get('create_test', 2, 1);
-		
-		$this->assertIsA($query, 'PDOStatement');
-	}
-
-	function TestSelectWhereGet()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->select('id, key as k, val')
-			->where('id >', 1)
-			->where('id <', 900)
-			->get('create_test', 2, 1);
-
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestSelectWhereGet2()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->select('id, key as k, val')
-			->where('id !=', 1)
-			->get('create_test', 2, 1);
-
-		$this->assertIsA($query, 'PDOStatement');
-	}
-
-	function TestSelectGet()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->select('id, key as k, val')
-			->get('create_test', 2, 1);
-
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestSelectFromGet()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->select('id, key as k, val')
-			->from('create_test ct')
-			->where('id >', 1)
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestSelectFromLimitGet()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->select('id, key as k, val')
-			->from('create_test ct')
-			->where('id >', 1)
-			->limit(3)
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestOrderBy()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
-			->where('id >', 0)
-			->where('id <', 9000)
-			->order_by('id', 'DESC')
-			->order_by('k', 'ASC')
-			->limit(5,2)
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestOrderByRandom()
-	{
-		if (empty($this->db))  return;
-		
-		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
-			->where('id >', 0)
-			->where('id <', 9000)
-			->order_by('id', 'rand')
-			->limit(5,2)
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestGroupBy()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
-			->where('id >', 0)
-			->where('id <', 9000)
-			->group_by('k')
-			->group_by('val')
-			->order_by('id', 'DESC')
-			->order_by('k', 'ASC')
-			->limit(5,2)
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestOrWhere()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
-			->where(' id ', 1)
-			->or_where('key >', 0)
-			->limit(2, 1)
-			->get();
-		
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestLike()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->from('create_test')
-			->like('key', 'og')
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestJoin()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->from('create_test')
-			->join('create_join cj', 'cj.id = create_test.id')
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestInsert()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->set('id', 4)
-			->set('key', 4)
-			->set('val', 5)
-			->insert('create_test');
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestUpdate()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->set('id', 4)
-			->set('key', 'gogle')
-			->set('val', 'non-word')
-			->where('id', 4)
-			->update('create_test');
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestDelete()
-	{
-		if (empty($this->db))  return;
-	
-		$query = $this->db->where('id', 4)->delete('create_test');
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-
 }

tests/databases/sqlite-qb.php

@@ -15,7 +15,7 @@
 /**
  * Class for testing Query Builder with SQLite 
  */
- class SQLiteQBTest extends UnitTestCase {
+ class SQLiteQBTest extends QBTest {
  
  	function __construct()
  	{
@@ -30,174 +30,4 @@
 		
 		echo '<hr /> SQLite Queries <hr />';
  	}
-	
-	function TestGet()
-	{
-		$query = $this->db->get('create_test ct');
-		
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestGetLimit()
-	{
-		$query = $this->db->get('create_test', 2);
-		
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestGetLimitSkip()
-	{
-		$query = $this->db->get('create_test', 2, 1);
-		
-		$this->assertIsA($query, 'PDOStatement');
-	}
-
-	function TestSelectWhereGet()
-	{
-		$query = $this->db->select('id, key as k, val')
-			->where('id >', 1)
-			->where('id <', 900)
-			->get('create_test', 2, 1);
-
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestSelectWhereGet2()
-	{
-		$query = $this->db->select('id, key as k, val')
-			->where('id !=', 1)
-			->get('create_test', 2, 1);
-
-		$this->assertIsA($query, 'PDOStatement');
-	}
-
-	function TestSelectGet()
-	{
-		$query = $this->db->select('id, key as k, val')
-			->get('create_test', 2, 1);
-
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestSelectFromGet()
-	{
-		$query = $this->db->select('id, key as k, val')
-			->from('create_test ct')
-			->where('id >', 1)
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestSelectFromLimitGet()
-	{
-		$query = $this->db->select('id, key as k, val')
-			->from('create_test ct')
-			->where('id >', 1)
-			->limit(3)
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestOrderBy()
-	{
-		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
-			->where('id >', 0)
-			->where('id <', 9000)
-			->order_by('id', 'DESC')
-			->order_by('k', 'ASC')
-			->limit(5,2)
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestOrderByRandom()
-	{
-		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
-			->where('id >', 0)
-			->where('id <', 9000)
-			->order_by('id', 'rand')
-			->limit(5,2)
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestGroupBy()
-	{
-		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
-			->where('id >', 0)
-			->where('id <', 9000)
-			->group_by('k')
-			->group_by('val')
-			->order_by('id', 'DESC')
-			->order_by('k', 'ASC')
-			->limit(5,2)
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestOrWhere()
-	{
-		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
-			->where(' id ', 1)
-			->or_where('key >', 0)
-			->limit(2, 1)
-			->get();
-		
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestLike()
-	{
-		$query = $this->db->from('create_test')
-			->like('key', 'og')
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestJoin()
-	{
-		$query = $this->db->from('create_test')
-			->join('create_join cj', 'cj.id = create_test.id')
-			->get();
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestInsert()
-	{
-		$query = $this->db->set('id', 4)
-			->set('key', 4)
-			->set('val', 5)
-			->insert('create_test');
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestUpdate()
-	{
-		$query = $this->db->set('id', 4)
-			->set('key', 'gogle')
-			->set('val', 'non-word')
-			->where('id', 4)
-			->update('create_test');
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
-	
-	function TestDelete()
-	{
-		$query = $this->db->where('id', 4)->delete('create_test');
-			
-		$this->assertIsA($query, 'PDOStatement');
-	}
 }

tests/databases/sqlite.php

@@ -17,11 +17,11 @@
  * 
  * @extends UnitTestCase
  */
-class SQLiteTest extends UnitTestCase {
+class SQLiteTest extends DBTest {
 	
 	function __construct()
 	{
-		parent::__construct();
+		//parent::__construct();
 	}
 	
 	function setUp()

tests/index.php

@@ -23,6 +23,9 @@ define('DS', DIRECTORY_SEPARATOR);
 // it has to be set in your php path, or put in the tests folder
 require_once('simpletest/autorun.php');
 
+// Require base testing classes
+require_once(TEST_DIR.'/parent.php');
+
 
 // Bulk loading wrapper workaround for PHP < 5.4
 function do_include($path)

tests/parent.php

@@ -0,0 +1,234 @@
+<?php
+/**
+ * Query
+ *
+ * Free Query Builder / Database Abstraction Layer
+ *
+ * @author 		Timothy J. Warren
+ * @copyright	Copyright (c) 2012
+ * @link 		https://github.com/aviat4ion/Query
+ * @license 	http://philsturgeon.co.uk/code/dbad-license 
+ */
+
+// --------------------------------------------------------------------------
+
+abstract class QBTest extends UnitTestCase {
+
+	function TestGet()
+	{
+		if (empty($this->db))  return;
+	
+		$query = $this->db->get('create_test');
+		
+		$this->assertIsA($query, 'PDOStatement');
+	}
+	
+	function TestGetLimit()
+	{
+		if (empty($this->db))  return;
+	
+		$query = $this->db->get('create_test', 2);
+		
+		$this->assertIsA($query, 'PDOStatement');
+	}
+	
+	function TestGetLimitSkip()
+	{
+		if (empty($this->db))  return;
+	
+		$query = $this->db->get('create_test', 2, 1);
+		
+		$this->assertIsA($query, 'PDOStatement');
+	}
+
+	function TestSelectWhereGet()
+	{
+		if (empty($this->db))  return;
+	
+		$query = $this->db->select('id, key as k, val')
+			->where('id >', 1)
+			->where('id <', 900)
+			->get('create_test', 2, 1);
+
+		$this->assertIsA($query, 'PDOStatement');
+	}
+	
+	function TestSelectWhereGet2()
+	{
+		if (empty($this->db))  return;
+	
+		$query = $this->db->select('id, key as k, val')
+			->where('id !=', 1)
+			->get('create_test', 2, 1);
+
+		$this->assertIsA($query, 'PDOStatement');
+	}
+
+	function TestSelectGet()
+	{
+		if (empty($this->db))  return;
+	
+		$query = $this->db->select('id, key as k, val')
+			->get('create_test', 2, 1);
+
+		$this->assertIsA($query, 'PDOStatement');
+	}
+	
+	function TestSelectFromGet()
+	{
+		if (empty($this->db))  return;
+	
+		$query = $this->db->select('id, key as k, val')
+			->from('create_test ct')
+			->where('id >', 1)
+			->get();
+			
+		$this->assertIsA($query, 'PDOStatement');
+	}
+	
+	function TestSelectFromLimitGet()
+	{
+		if (empty($this->db))  return;
+	
+		$query = $this->db->select('id, key as k, val')
+			->from('create_test ct')
+			->where('id >', 1)
+			->limit(3)
+			->get();
+			
+		$this->assertIsA($query, 'PDOStatement');
+	}
+	
+	function TestOrderBy()
+	{
+		if (empty($this->db))  return;
+	
+		$query = $this->db->select('id, key as k, val')
+			->from('create_test')
+			->where('id >', 0)
+			->where('id <', 9000)
+			->order_by('id', 'DESC')
+			->order_by('k', 'ASC')
+			->limit(5,2)
+			->get();
+			
+		$this->assertIsA($query, 'PDOStatement');
+	}
+	
+	function TestOrderByRandom()
+	{
+		if (empty($this->db))  return;
+		
+		$query = $this->db->select('id, key as k, val')
+			->from('create_test')
+			->where('id >', 0)
+			->where('id <', 9000)
+			->order_by('id', 'rand')
+			->limit(5,2)
+			->get();
+			
+		$this->assertIsA($query, 'PDOStatement');
+	}
+	
+	function TestGroupBy()
+	{
+		if (empty($this->db))  return;
+	
+		$query = $this->db->select('id, key as k, val')
+			->from('create_test')
+			->where('id >', 0)
+			->where('id <', 9000)
+			->group_by('k')
+			->group_by('val')
+			->order_by('id', 'DESC')
+			->order_by('k', 'ASC')
+			->limit(5,2)
+			->get();
+			
+		$this->assertIsA($query, 'PDOStatement');
+	}
+	
+	function TestOrWhere()
+	{
+		if (empty($this->db))  return;
+	
+		$query = $this->db->select('id, key as k, val')
+			->from('create_test')
+			->where(' id ', 1)
+			->or_where('key >', 0)
+			->limit(2, 1)
+			->get();
+		
+		$this->assertIsA($query, 'PDOStatement');
+	}
+	
+	function TestLike()
+	{
+		if (empty($this->db))  return;
+	
+		$query = $this->db->from('create_test')
+			->like('key', 'og')
+			->get();
+			
+		$this->assertIsA($query, 'PDOStatement');
+	}
+	
+	function TestJoin()
+	{
+		if (empty($this->db))  return;
+	
+		$query = $this->db->from('create_test')
+			->join('create_join cj', 'cj.id = create_test.id')
+			->get();
+			
+		$this->assertIsA($query, 'PDOStatement');
+	}
+	
+	function TestInsert()
+	{
+		if (empty($this->db))  return;
+	
+		$query = $this->db->set('id', 4)
+			->set('key', 4)
+			->set('val', 5)
+			->insert('create_test');
+			
+		$this->assertIsA($query, 'PDOStatement');
+	}
+	
+	function TestUpdate()
+	{
+		if (empty($this->db))  return;
+	
+		$query = $this->db->set('id', 4)
+			->set('key', 'gogle')
+			->set('val', 'non-word')
+			->where('id', 4)
+			->update('create_test');
+			
+		$this->assertIsA($query, 'PDOStatement');
+	}
+	
+	function TestDelete()
+	{
+		if (empty($this->db))  return;
+	
+		$query = $this->db->where('id', 4)->delete('create_test');
+			
+		$this->assertIsA($query, 'PDOStatement');
+	}
+
+}
+
+// --------------------------------------------------------------------------
+
+abstract class DBTest extends UnitTestCase {
+
+	abstract function TestConnection();
+
+	function tearDown()
+	{
+		unset($this->db);
+	}
+
+}