100% code coverage of the base classes

tests/core/db_qb_test.php

@@ -67,7 +67,7 @@ abstract class QBTest extends Query_TestCase {
 
 	public function testGet()
 	{
-		$query = $this->db->get('create_test');
+		$query = $this->db->get('test');
 
 		$this->assertIsA($query, 'PDOStatement');
 	}
@@ -85,7 +85,7 @@ abstract class QBTest extends Query_TestCase {
 
 	public function testGetWNumRows()
 	{
-		$query = $this->db->get('create_test');
+		$query = $this->db->get('test');
 		$numrows = count($query->fetchAll(PDO::FETCH_NUM));
 
 		$this->assertEqual($this->db->num_rows(), $numrows);
@@ -95,7 +95,7 @@ abstract class QBTest extends Query_TestCase {
 
 	public function testGetLimit()
 	{
-		$query = $this->db->get('create_test', 2);
+		$query = $this->db->get('test', 2);
 
 		$this->assertIsA($query, 'PDOStatement');
 	}
@@ -104,7 +104,7 @@ abstract class QBTest extends Query_TestCase {
 
 	public function testGetLimitSkip()
 	{
-		$query = $this->db->get('create_test', 2, 1);
+		$query = $this->db->get('test', 2, 1);
 
 		$this->assertIsA($query, 'PDOStatement');
 	}
@@ -113,7 +113,7 @@ abstract class QBTest extends Query_TestCase {
 
 	public function testGetWhere()
 	{
-		$query = $this->db->get_where('create_test', array('id !=' => 1), 2, 1);
+		$query = $this->db->get_where('test', array('id !=' => 1), 2, 1);
 
 		$this->assertIsA($query, 'PDOStatement');
 	}
@@ -123,7 +123,7 @@ abstract class QBTest extends Query_TestCase {
 	public function testHaving()
 	{
 		$query = $this->db->select('id')
-			->from('create_test')
+			->from('test')
 			->group_by('id')
 			->having(array('id >' => 1))
 			->having('id !=', 3)
@@ -137,7 +137,7 @@ abstract class QBTest extends Query_TestCase {
 	public function testOrHaving()
 	{
 		$query = $this->db->select('id')
-			->from('create_test')
+			->from('test')
 			->group_by('id')
 			->having(array('id >' => 1))
 			->or_having('id !=', 3)
@@ -162,7 +162,7 @@ abstract class QBTest extends Query_TestCase {
 		$query = $this->db->select('id, key as k, val')
 			->where('id >', 1)
 			->where('id <', 900)
-			->get('create_test', 2, 1);
+			->get('test', 2, 1);
 
 		$this->assertIsA($query, 'PDOStatement');
 	}
@@ -175,7 +175,7 @@ abstract class QBTest extends Query_TestCase {
 	{
 		$query = $this->db->select('id, key as k, val')
 			->where('id !=', 1)
-			->get('create_test', 2, 1);
+			->get('test', 2, 1);
 
 		$this->assertIsA($query, 'PDOStatement');
 	}
@@ -195,7 +195,7 @@ abstract class QBTest extends Query_TestCase {
 	public function testSelectMin()
 	{
 		$query = $this->db->select_min('id', 'di')
-			->get('create_test');
+			->get('test');
 
 		$this->assertIsA($query, 'PDOStatement');
 	}
@@ -204,7 +204,7 @@ abstract class QBTest extends Query_TestCase {
 
 	public function testMultiOrderBy()
 	{
-		$query = $this->db->from('create_test')
+		$query = $this->db->from('test')
 			->order_by('id, key')
 			->get();
 
@@ -218,7 +218,7 @@ abstract class QBTest extends Query_TestCase {
 	public function testGroup()
 	{
 		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
+			->from('test')
 			->group_start()
 			->where('id >', 1)
 			->where('id <', 900)
@@ -232,7 +232,7 @@ abstract class QBTest extends Query_TestCase {
 	public function testOrGroup()
 	{
 		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
+			->from('test')
 			->group_start()
 			->where('id >', 1)
 			->where('id <', 900)
@@ -249,7 +249,7 @@ abstract class QBTest extends Query_TestCase {
 	public function testOrNotGroup()
 	{
 		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
+			->from('test')
 			->group_start()
 			->where('id >', 1)
 			->where('id <', 900)
@@ -269,7 +269,7 @@ abstract class QBTest extends Query_TestCase {
 
 	public function testWhereIn()
 	{
-		$query = $this->db->from('create_test')
+		$query = $this->db->from('test')
 			->where_in('id', array(0, 6, 56, 563, 341))
 			->get();
 
@@ -280,7 +280,7 @@ abstract class QBTest extends Query_TestCase {
 
 	public function testOrWhereIn()
 	{
-		$query = $this->db->from('create_test')
+		$query = $this->db->from('test')
 			->where('key', 'false')
 			->or_where_in('id', array(0, 6, 56, 563, 341))
 			->get();
@@ -292,7 +292,7 @@ abstract class QBTest extends Query_TestCase {
 	
 	public function testWhereNotIn()
 	{
-		$query = $this->db->from('create_test')
+		$query = $this->db->from('test')
 			->where('key', 'false')
 			->where_not_in('id', array(0, 6, 56, 563, 341))
 			->get();
@@ -304,7 +304,7 @@ abstract class QBTest extends Query_TestCase {
 	
 	public function testOrWhereNotIn()
 	{
-		$query = $this->db->from('create_test')
+		$query = $this->db->from('test')
 			->where('key', 'false')
 			->or_where_not_in('id', array(0, 6, 56, 563, 341))
 			->get();
@@ -317,7 +317,7 @@ abstract class QBTest extends Query_TestCase {
 	public function testSelectAvg()
 	{
 		$query = $this->db->select_avg('id', 'di')
-			->get('create_test');
+			->get('test');
 
 		$this->assertIsA($query, 'PDOStatement');
 	}
@@ -327,7 +327,7 @@ abstract class QBTest extends Query_TestCase {
 	public function testSelectSum()
 	{
 		$query = $this->db->select_sum('id', 'di')
-			->get('create_test');
+			->get('test');
 
 		$this->assertIsA($query, 'PDOStatement');
 	}
@@ -338,7 +338,7 @@ abstract class QBTest extends Query_TestCase {
 	{
 		$query = $this->db->select_sum('id', 'di')
 			->distinct()
-			->get('create_test');
+			->get('test');
 
 		$this->assertIsA($query, 'PDOStatement');
 	}
@@ -348,7 +348,7 @@ abstract class QBTest extends Query_TestCase {
 	public function testSelectGet()
 	{
 		$query = $this->db->select('id, key as k, val')
-			->get('create_test', 2, 1);
+			->get('test', 2, 1);
 
 		$this->assertIsA($query, 'PDOStatement');
 	}
@@ -358,7 +358,7 @@ abstract class QBTest extends Query_TestCase {
 	public function testSelectFromGet()
 	{
 		$query = $this->db->select('id, key as k, val')
-			->from('create_test ct')
+			->from('test ct')
 			->where('id >', 1)
 			->get();
 
@@ -370,7 +370,7 @@ abstract class QBTest extends Query_TestCase {
 	public function testSelectFromLimitGet()
 	{
 		$query = $this->db->select('id, key as k, val')
-			->from('create_test ct')
+			->from('test ct')
 			->where('id >', 1)
 			->limit(3)
 			->get();
@@ -385,7 +385,7 @@ abstract class QBTest extends Query_TestCase {
 	public function testOrderBy()
 	{
 		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
+			->from('test')
 			->where('id >', 0)
 			->where('id <', 9000)
 			->order_by('id', 'DESC')
@@ -401,7 +401,7 @@ abstract class QBTest extends Query_TestCase {
 	public function testOrderByRandom()
 	{
 		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
+			->from('test')
 			->where('id >', 0)
 			->where('id <', 9000)
 			->order_by('id', 'rand')
@@ -416,7 +416,7 @@ abstract class QBTest extends Query_TestCase {
 	public function testGroupBy()
 	{
 		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
+			->from('test')
 			->where('id >', 0)
 			->where('id <', 9000)
 			->group_by('k')
@@ -438,7 +438,7 @@ abstract class QBTest extends Query_TestCase {
 	public function testOrWhere()
 	{
 		$query = $this->db->select('id, key as k, val')
-			->from('create_test')
+			->from('test')
 			->where(' id ', 1)
 			->or_where('key >', 0)
 			->limit(2, 1)
@@ -451,7 +451,7 @@ abstract class QBTest extends Query_TestCase {
 
 	public function testLike()
 	{
-		$query = $this->db->from('create_test')
+		$query = $this->db->from('test')
 			->like('key', 'og')
 			->get();
 
@@ -462,7 +462,7 @@ abstract class QBTest extends Query_TestCase {
 	
 	public function testOrLike()
 	{
-		$query = $this->db->from('create_test')
+		$query = $this->db->from('test')
 			->like('key', 'og')
 			->or_like('key', 'val')
 			->get();
@@ -474,7 +474,7 @@ abstract class QBTest extends Query_TestCase {
 	
 	public function testOrNotLike()
 	{
-		$query = $this->db->from('create_test')
+		$query = $this->db->from('test')
 			->like('key', 'og', 'before')
 			->or_not_like('key', 'val')
 			->get();
@@ -486,7 +486,7 @@ abstract class QBTest extends Query_TestCase {
 	
 	public function testNotLike()
 	{
-		$query = $this->db->from('create_test')
+		$query = $this->db->from('test')
 			->like('key', 'og', 'before')
 			->not_like('key', 'val')
 			->get();
@@ -498,7 +498,7 @@ abstract class QBTest extends Query_TestCase {
 	
 	public function testLikeBefore()
 	{
-		$query = $this->db->from('create_test')
+		$query = $this->db->from('test')
 			->like('key', 'og', 'before')
 			->get();
 
@@ -509,7 +509,7 @@ abstract class QBTest extends Query_TestCase {
 	
 	public function testLikeAfter()
 	{
-		$query = $this->db->from('create_test')
+		$query = $this->db->from('test')
 			->like('key', 'og', 'after')
 			->get();
 
@@ -520,7 +520,7 @@ abstract class QBTest extends Query_TestCase {
 
 	public function testJoin()
 	{
-		$query = $this->db->from('create_test ct')
+		$query = $this->db->from('test ct')
 			->join('join cj', 'cj.id = ct.id')
 			->get();
 
@@ -531,7 +531,7 @@ abstract class QBTest extends Query_TestCase {
 
 	public function testLeftJoin()
 	{
-		$query = $this->db->from('create_test ct')
+		$query = $this->db->from('test ct')
 			->join('join cj', 'cj.id = ct.id', 'left')
 			->get();
 
@@ -542,7 +542,7 @@ abstract class QBTest extends Query_TestCase {
 
 	public function testInnerJoin()
 	{
-		$query = $this->db->from('create_test ct')
+		$query = $this->db->from('test ct')
 			->join('join cj', 'cj.id = ct.id', 'inner')
 			->get();
 
@@ -555,9 +555,9 @@ abstract class QBTest extends Query_TestCase {
 
 	public function testInsert()
 	{
-		$query = $this->db->set('id', 4)
-			->set('key', 4)
-			->set('val', 5)
+		$query = $this->db->set('id', 98)
+			->set('key', 84)
+			->set('val', 120)
 			->insert('test');
 
 		$this->assertIsA($query, 'PDOStatement');
@@ -608,7 +608,7 @@ abstract class QBTest extends Query_TestCase {
 	public function testUpdate()
 	{
 		$query = $this->db->where('id', 7)
-			->update('create_test', array(
+			->update('test', array(
 				'id' => 7,
 				'key' => 'gogle',
 				'val' => 'non-word'
@@ -629,7 +629,7 @@ abstract class QBTest extends Query_TestCase {
 
 		$query = $this->db->set($array)
 			->where('id', 22)
-			->update('create_test');
+			->update('test');
 
 		$this->assertIsA($query, 'PDOStatement');
 	}
@@ -651,7 +651,7 @@ abstract class QBTest extends Query_TestCase {
 
 	public function testDelete()
 	{
-		$query = $this->db->delete('create_test', array('id' => 5));
+		$query = $this->db->delete('test', array('id' => 5));
 
 		$this->assertIsA($query, 'PDOStatement');
 	}
@@ -694,7 +694,7 @@ abstract class QBTest extends Query_TestCase {
 
 	public function testNumRows()
 	{
-		$query = $this->db->get('create_test');
+		$query = $this->db->get('test');
 
 		$this->assertTrue(is_numeric($this->db->num_rows()));
 	}
@@ -705,8 +705,8 @@ abstract class QBTest extends Query_TestCase {
 	
 	public function testGetCompiledSelect()
 	{
-		$sql = $this->db->get_compiled_select('create_test');
-		$qb_res = $this->db->get('create_test');
+		$sql = $this->db->get_compiled_select('test');
+		$qb_res = $this->db->get('test');
 		$sql_res = $this->db->query($sql);
 		
 		$this->assertEquals($qb_res, $sql_res);
@@ -718,7 +718,7 @@ abstract class QBTest extends Query_TestCase {
 			'id' => 4,
 			'key' => 'foo',
 			'val' => 'baz'
-		))->get_compiled_update('create_test');
+		))->get_compiled_update('test');
 		
 		$this->assertTrue(is_string($sql));
 	}
@@ -729,7 +729,7 @@ abstract class QBTest extends Query_TestCase {
 			'id' => 4,
 			'key' => 'foo',
 			'val' => 'baz'
-		))->get_compiled_insert('create_test');
+		))->get_compiled_insert('test');
 		
 		$this->assertTrue(is_string($sql));
 	}
@@ -737,7 +737,7 @@ abstract class QBTest extends Query_TestCase {
 	public function testGetCompiledDelete()
 	{
 		$sql = $this->db->where('id', 4)
-			->get_compiled_delete('create_test');
+			->get_compiled_delete('test');
 			
 		$this->assertTrue(is_string($sql));
 	}
@@ -816,7 +816,7 @@ abstract class QBTest extends Query_TestCase {
 			'id' => 999,
 			'key' => 'ring',
 			'val' => 'sale'
-		))->insert('create_test');
+		))->insert('test');
 		
 		$res = $this->db->num_rows();
 		$this->assertEqual(NULL, $res);

tests/core/db_test.php

@@ -63,7 +63,7 @@ abstract class DBTest extends Query_TestCase {
 	
 	public function testGetColumns()
 	{
-		$cols = $this->db->get_columns('create_test');
+		$cols = $this->db->get_columns('test');
 		$this->assertTrue(is_array($cols));
 	}
 	

tests/databases/mysql/MySQLQBTest.php

@@ -21,12 +21,12 @@ class MySQLQBTest extends QBTest {
 	public function setUp()
  	{
  		// Attempt to connect, if there is a test config file
-		if (is_file(QBASE_DIR . "test_config.json"))
+		if (is_file(QTEST_DIR . "/settings.json"))
 		{
-			$params = json_decode(file_get_contents(QBASE_DIR . "test_config.json"));
+			$params = json_decode(file_get_contents(QTEST_DIR . "/settings.json"));
 			$params = $params->mysql;
 			$params->type = "MySQL";
-			$params->prefix = "create_";
+			//$params->prefix = "create_";
 			$params->options = array();
 			$params->options[PDO::ATTR_PERSISTENT]  = TRUE;
 		}
@@ -61,7 +61,7 @@ class MySQLQBTest extends QBTest {
 			->explain()
 			->where('id >', 1)
 			->where('id <', 900)
-			->get('create_test', 2, 1);
+			->get('test', 2, 1);
 			
 		$res = $query->fetchAll(PDO::FETCH_ASSOC);
 		
@@ -69,7 +69,7 @@ class MySQLQBTest extends QBTest {
 		  array (
 		    'id' => '1',
 		    'select_type' => 'SIMPLE',
-		    'table' => 'create_test',
+		    'table' => 'test',
 		    'type' => 'range',
 		    'possible_keys' => 'PRIMARY',
 		    'key' => 'PRIMARY',

tests/databases/mysql/MySQLTest.php

@@ -24,9 +24,9 @@ class MySQLTest extends DBTest {
 	public function setUp()
 	{
 		// Attempt to connect, if there is a test config file
-		if (is_file(QBASE_DIR . "test_config.json"))
+		if (is_file(QTEST_DIR . "/settings.json"))
 		{
-			$params = json_decode(file_get_contents(QBASE_DIR . "test_config.json"));
+			$params = json_decode(file_get_contents(QTEST_DIR . "/settings.json"));
 			$params = $params->mysql;
 
 			$this->db = new MySQL("mysql:host={$params->host};dbname={$params->database}", $params->user, $params->pass, array(
@@ -58,7 +58,7 @@ class MySQLTest extends DBTest {
 	public function testCreateTable()
 	{
 		//Attempt to create the table
-		$sql = $this->db->util->create_table('create_test',
+		$sql = $this->db->util->create_table('test',
 			array(
 				'id' => 'int(10)',
 				'key' => 'TEXT',
@@ -72,7 +72,7 @@ class MySQLTest extends DBTest {
 		$this->db->query($sql);
 
 		//Attempt to create the table
-		$sql = $this->db->util->create_table('create_join',
+		$sql = $this->db->util->create_table('join',
 			array(
 				'id' => 'int(10)',
 				'key' => 'TEXT',
@@ -87,7 +87,7 @@ class MySQLTest extends DBTest {
 		//Check
 		$dbs = $this->db->get_tables();
 
-		$this->assertTrue(in_array('create_test', $dbs));
+		$this->assertTrue(in_array('test', $dbs));
 
 	}
 	
@@ -95,8 +95,8 @@ class MySQLTest extends DBTest {
 	
 	public function testTruncate()
 	{
-		$this->db->truncate('create_test');
-		$this->db->truncate('create_join');
+		$this->db->truncate('test');
+		$this->db->truncate('join');
 	}
 	
 	// --------------------------------------------------------------------------
@@ -104,7 +104,7 @@ class MySQLTest extends DBTest {
 	public function testPreparedStatements()
 	{
 		$sql = <<<SQL
-			INSERT INTO `create_test` (`id`, `key`, `val`)
+			INSERT INTO `test` (`id`, `key`, `val`)
 			VALUES (?,?,?)
 SQL;
 		$statement = $this->db->prepare_query($sql, array(1,"boogers", "Gross"));
@@ -117,10 +117,29 @@ SQL;
 	
 	// --------------------------------------------------------------------------
 	
+	public function testBadPreparedStatement()
+	{
+		$sql = <<<SQL
+			INSERT INTO `test` (`id`, `key`, `val`)
+			VALUES (?,?,?)
+SQL;
+		try 
+		{
+			$statement = $this->db->prepare_query($sql, 'foo');
+		}
+		catch(InvalidArgumentException $e)
+		{
+			$this->assertTrue(TRUE);
+		}
+		
+	}
+	
+	// --------------------------------------------------------------------------
+
 	public function testPrepareExecute()
 	{
 		$sql = <<<SQL
-			INSERT INTO `create_test` (`id`, `key`, `val`)
+			INSERT INTO `test` (`id`, `key`, `val`)
 			VALUES (?,?,?)
 SQL;
 		$res = $this->db->prepare_execute($sql, array(
@@ -137,7 +156,7 @@ SQL;
 	{
 		$res = $this->db->beginTransaction();
 
-		$sql = 'INSERT INTO `create_test` (`id`, `key`, `val`) VALUES (10, 12, 14)';
+		$sql = 'INSERT INTO `test` (`id`, `key`, `val`) VALUES (10, 12, 14)';
 		$this->db->query($sql);
 
 		$res = $this->db->commit();
@@ -150,7 +169,7 @@ SQL;
 	{
 		$res = $this->db->beginTransaction();
 
-		$sql = 'INSERT INTO `create_test` (`id`, `key`, `val`) VALUES (182, 96, 43)';
+		$sql = 'INSERT INTO `test` (`id`, `key`, `val`) VALUES (182, 96, 43)';
 		$this->db->query($sql);
 
 		$res = $this->db->rollback();

tests/databases/pgsql/PgSQLQBTest.php

@@ -26,9 +26,9 @@ class PgSQLQBTest extends QBTest {
 		}
  		
  		// Attempt to connect, if there is a test config file
-		if (is_file(QBASE_DIR . "test_config.json"))
+		if (is_file(QTEST_DIR . "/settings.json"))
 		{
-			$params = json_decode(file_get_contents(QBASE_DIR . "test_config.json"));
+			$params = json_decode(file_get_contents(QTEST_DIR . "/settings.json"));
 			$params = $params->pgsql;
 			$params->type = "pgsql";
 			$params->prefix = 'create_';

tests/databases/pgsql/PgSQLTest.php

@@ -30,9 +30,9 @@ class PgTest extends DBTest {
 		}
 
 		// Attempt to connect, if there is a test config file
-		if (is_file(QBASE_DIR . "test_config.json"))
+		if (is_file(QTEST_DIR . "/settings.json"))
 		{
-			$params = json_decode(file_get_contents(QBASE_DIR . "test_config.json"));
+			$params = json_decode(file_get_contents(QTEST_DIR . "/settings.json"));
 			$params = $params->pgsql;
 
 			$this->db = new PgSQL("pgsql:host={$params->host};dbname={$params->database}", $params->user, $params->pass);
@@ -140,6 +140,25 @@ SQL;
 	
 	// --------------------------------------------------------------------------
 	
+	public function testBadPreparedStatement()
+	{
+		$sql = <<<SQL
+			INSERT INTO "create_test" ("id", "key", "val")
+			VALUES (?,?,?)
+SQL;
+		try 
+		{
+			$statement = $this->db->prepare_query($sql, 'foo');
+		}
+		catch(InvalidArgumentException $e)
+		{
+			$this->assertTrue(TRUE);
+		}
+		
+	}
+	
+	// --------------------------------------------------------------------------
+
 	public function testPrepareExecute()
 	{
 		if (empty($this->db))  return;

tests/databases/sqlite/SqliteQBTest.php

@@ -22,18 +22,28 @@
  	public function setUp()
  	{
  		$path = QTEST_DIR.QDS.'db_files'.QDS.'test_sqlite.db';
-		$params = new Stdclass();
-		$params->type = 'sqlite';
-		$params->file = $path;
-		$params->host = 'localhost';
-		$params->prefix = 'create_';
-		$params->options = array();
-		$params->options[PDO::ATTR_PERSISTENT] = TRUE;
+		$params = (object) array(
+			'type' => 'sqlite',
+			'file' => $path,
+			'host' => 'localhost',
+			'prefix' => 'create_',
+			'options' => array(
+				PDO::ATTR_PERSISTENT => TRUE
+			)
+		);
 		$this->db = Query($params);
 
 		// echo '<hr /> SQLite Queries <hr />';
  	}
  	
+ 	public function testInsert() { $this->markTestSkipped();}
+ 	public function testInsertArray() { $this->markTestSkipped();}
+ 	public function testUpdate() { $this->markTestSkipped();}
+ 	public function testSetArrayUpdate() { $this->markTestSkipped();}
+ 	public function testWhereSetUpdate() { $this->markTestSkipped();}
+ 	public function testDelete() { $this->markTestSkipped();}
+ 	public function testBadNumRows() { $this->markTestSkipped();}
+ 	
  	// --------------------------------------------------------------------------
  	
  	public function testInsertBatch()

tests/phpunit.xml

@@ -30,7 +30,7 @@
         </testsuite>
         <testsuite name="SQLiteTests">
             <file>databases/sqlite/SqliteTest.php</file>
-        	<file>databases/mysql/SqliteQBTest.php</file>
+        	<file>databases/sqlite/SqliteQBTest.php</file>
         </testsuite>
     </testsuites>
 </phpunit>