From 44015c8d91ecea78ee4a10de579c36a859c2fcb6 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Wed, 4 Apr 2012 19:38:16 +0700
Subject: Set up PDO constant and configuration

---
 tests/mocks/database/config/pdo/mysql.php  | 37 ++++++++++++++++++++++++++++++
 tests/mocks/database/config/pdo/pgsql.php  | 37 ++++++++++++++++++++++++++++++
 tests/mocks/database/config/pdo/sqlite.php | 22 ++++++++++++++++++
 tests/mocks/database/config/sqlite.php     |  7 +++---
 4 files changed, 99 insertions(+), 4 deletions(-)
 create mode 100644 tests/mocks/database/config/pdo/mysql.php
 create mode 100644 tests/mocks/database/config/pdo/pgsql.php
 create mode 100644 tests/mocks/database/config/pdo/sqlite.php

(limited to 'tests/mocks')

diff --git a/tests/mocks/database/config/pdo/mysql.php b/tests/mocks/database/config/pdo/mysql.php
new file mode 100644
index 000000000..cefb6b008
--- /dev/null
+++ b/tests/mocks/database/config/pdo/mysql.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	
+	// Typical Database configuration
+	'pdo/mysql' => array(
+		'dsn' => '',
+		'hostname' => 'localhost',
+		'username' => 'travis',
+		'password' => '',
+		'database' => 'ci_test',
+		'dbdriver' => 'pdo',
+		'pdodriver' => 'mysql',
+	),
+
+	// Database configuration with failover
+	'pdo/mysql_failover' => array(
+		'dsn' => '',
+		'hostname' => 'localhost',
+		'username' => 'not_travis',
+		'password' => 'wrong password',
+		'database' => 'not_ci_test',
+		'dbdriver' => 'pdo',
+		'pdodriver' => 'mysql',
+		'failover' => array(
+			array(
+				'dsn' => '',
+				'hostname' => 'localhost',
+				'username' => 'travis',
+				'password' => '',
+				'database' => 'ci_test',
+				'dbdriver' => 'pdo',
+				'pdodriver' => 'mysql',
+			),
+		),
+	),
+);
\ No newline at end of file
diff --git a/tests/mocks/database/config/pdo/pgsql.php b/tests/mocks/database/config/pdo/pgsql.php
new file mode 100644
index 000000000..b2f409d8d
--- /dev/null
+++ b/tests/mocks/database/config/pdo/pgsql.php
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+	
+	// Typical Database configuration
+	'pdo/pgsql' => array(
+		'dsn' => '',
+		'hostname' => 'localhost',
+		'username' => 'postgres',
+		'password' => '',
+		'database' => 'ci_test',
+		'dbdriver' => 'pdo',
+		'pdodriver' => 'pgsql',
+	),
+
+	// Database configuration with failover
+	'pdo/pgsql_failover' => array(
+		'dsn' => '',
+		'hostname' => 'localhost',
+		'username' => 'not_travis',
+		'password' => 'wrong password',
+		'database' => 'not_ci_test',
+		'dbdriver' => 'pdo',
+		'pdodriver' => 'pgsql',
+		'failover' => array(
+			array(
+				'dsn' => '',
+				'hostname' => 'localhost',
+				'username' => 'postgres',
+				'password' => '',
+				'database' => 'ci_test',
+				'dbdriver' => 'pdo',
+				'pdodriver' => 'pgsql',
+			),
+		),
+	),
+);
\ No newline at end of file
diff --git a/tests/mocks/database/config/pdo/sqlite.php b/tests/mocks/database/config/pdo/sqlite.php
new file mode 100644
index 000000000..c6827b41c
--- /dev/null
+++ b/tests/mocks/database/config/pdo/sqlite.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+	// Typical Database configuration
+	'pdo/sqlite' => array(
+		'dsn' => 'sqlite:/'.realpath(__DIR__.'/..').'/ci_test.sqlite',
+		'dbdriver' => 'pdo',
+	),
+
+	// Database configuration with failover
+	'pdo/sqlite_failover' => array(
+		'dsn' => 'sqlite:/'.realpath(__DIR__.'/..').'/not_exists.sqlite',
+		'dbdriver' => 'pdo',
+		'failover' => array(
+			array(
+				'dsn' => 'sqlite:/'.realpath(__DIR__.'/..').'/ci_test.sqlite',
+				'dbdriver' => 'pdo',
+			),
+		),
+	),
+);
\ No newline at end of file
diff --git a/tests/mocks/database/config/sqlite.php b/tests/mocks/database/config/sqlite.php
index 8665e208d..c70986e7c 100644
--- a/tests/mocks/database/config/sqlite.php
+++ b/tests/mocks/database/config/sqlite.php
@@ -1,5 +1,4 @@
 <?php
-$dbdriver = is_php('5.4') ? 'sqlite3' : 'sqlite';
 
 return array(
 
@@ -10,7 +9,7 @@ return array(
 		'username' => 'sqlite',
 		'password' => 'sqlite',
 		'database' => realpath(__DIR__.'/..').'/ci_test.sqlite',
-		'dbdriver' => $dbdriver,
+		'dbdriver' => is_php('5.4') ? 'sqlite3' : 'sqlite',
 	),
 
 	// Database configuration with failover
@@ -20,7 +19,7 @@ return array(
 		'username' => 'sqlite',
 		'password' => 'sqlite',
 		'database' => '../not_exists.sqlite',
-		'dbdriver' => $dbdriver,
+		'dbdriver' => is_php('5.4') ? 'sqlite3' : 'sqlite',
 		'failover' => array(
 			array(
 				'dsn' => '',
@@ -28,7 +27,7 @@ return array(
 				'username' => 'sqlite',
 				'password' => 'sqlite',
 				'database' => realpath(__DIR__.'/..').'/ci_testf.sqlite',
-				'dbdriver' => $dbdriver,
+				'dbdriver' => is_php('5.4') ? 'sqlite3' : 'sqlite',
 			),
 		),
 	),
-- 
cgit v1.2.3-24-g4f1b


From f4c6c9b3061b464c959b6409f962228959f35287 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Wed, 4 Apr 2012 23:24:09 +0700
Subject: DB Drivers test

---
 tests/mocks/autoloader.php                 | 15 +++++++++++--
 tests/mocks/database/config/ci_test.sqlite |  0
 tests/mocks/database/config/pdo/sqlite.php |  3 +++
 tests/mocks/database/db.php                |  6 +++++
 tests/mocks/database/db/driver.php         | 36 ++++++++++++++++++++++++++++++
 tests/mocks/database/drivers/mysql.php     | 16 +++++++++++++
 tests/mocks/database/drivers/pdo.php       | 16 +++++++++++++
 tests/mocks/database/drivers/postgre.php   | 16 +++++++++++++
 tests/mocks/database/drivers/sqlite.php    | 16 +++++++++++++
 9 files changed, 122 insertions(+), 2 deletions(-)
 create mode 100644 tests/mocks/database/config/ci_test.sqlite
 create mode 100644 tests/mocks/database/db/driver.php
 create mode 100644 tests/mocks/database/drivers/mysql.php
 create mode 100644 tests/mocks/database/drivers/pdo.php
 create mode 100644 tests/mocks/database/drivers/postgre.php
 create mode 100644 tests/mocks/database/drivers/sqlite.php

(limited to 'tests/mocks')

diff --git a/tests/mocks/autoloader.php b/tests/mocks/autoloader.php
index dd5929206..22448139e 100644
--- a/tests/mocks/autoloader.php
+++ b/tests/mocks/autoloader.php
@@ -53,13 +53,24 @@ function autoload($class)
 			$dir = BASEPATH.'libraries'.DIRECTORY_SEPARATOR;
 			$class = $subclass;
 		}
+		elseif (preg_match('/^CI_DB_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) == 3)
+		{
+			$driver_path = BASEPATH.'database'.DIRECTORY_SEPARATOR.'drivers'.DIRECTORY_SEPARATOR;
+			$dir = $driver_path.$m[1].DIRECTORY_SEPARATOR;
+			$file = $dir.$m[1].'_'.$m[2].'.php';
+		}
+		elseif (strpos($class, 'CI_DB') === 0)
+		{
+			$dir = BASEPATH.'database'.DIRECTORY_SEPARATOR;
+			$file = $dir.str_replace('CI_DB', 'DB', $subclass).'.php';
+		}
 		else
 		{
 			$class = strtolower($class);
 		}
 	}
 
-	$file = $dir.$class.'.php';
+	$file = (isset($file)) ? $file : $dir.$class.'.php';
 
 	if ( ! file_exists($file))
 	{
@@ -71,7 +82,7 @@ function autoload($class)
 		{
 			return FALSE;
 		}
-
+		var_dump($file);
 	    throw new InvalidArgumentException("Unable to load $class.");
 	}
 
diff --git a/tests/mocks/database/config/ci_test.sqlite b/tests/mocks/database/config/ci_test.sqlite
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/mocks/database/config/pdo/sqlite.php b/tests/mocks/database/config/pdo/sqlite.php
index c6827b41c..1e5043b00 100644
--- a/tests/mocks/database/config/pdo/sqlite.php
+++ b/tests/mocks/database/config/pdo/sqlite.php
@@ -6,16 +6,19 @@ return array(
 	'pdo/sqlite' => array(
 		'dsn' => 'sqlite:/'.realpath(__DIR__.'/..').'/ci_test.sqlite',
 		'dbdriver' => 'pdo',
+		'pdodriver' => 'sqlite',
 	),
 
 	// Database configuration with failover
 	'pdo/sqlite_failover' => array(
 		'dsn' => 'sqlite:/'.realpath(__DIR__.'/..').'/not_exists.sqlite',
 		'dbdriver' => 'pdo',
+		'pdodriver' => 'sqlite',
 		'failover' => array(
 			array(
 				'dsn' => 'sqlite:/'.realpath(__DIR__.'/..').'/ci_test.sqlite',
 				'dbdriver' => 'pdo',
+				'pdodriver' => 'sqlite',
 			),
 		),
 	),
diff --git a/tests/mocks/database/db.php b/tests/mocks/database/db.php
index 43a0d391f..c30e6d2e6 100644
--- a/tests/mocks/database/db.php
+++ b/tests/mocks/database/db.php
@@ -45,6 +45,8 @@ class Mock_Database_DB {
 		);
 
 		$config = array_merge($this->config[$group], $params);
+		$pdodriver = ( ! empty($config['pdodriver'])) ? $config['pdodriver'] : FALSE;
+		$failover = ( ! empty($config['failover'])) ? $config['failover'] : FALSE;
 
 		if ( ! empty($config['dsn']))
 		{
@@ -57,7 +59,11 @@ class Mock_Database_DB {
 
 		}
 
+		// Build the parameter
 		$other_params = array_slice($config, 6);
+		$other_params['dsn'] = $dsn;
+		if ($pdodriver) $other_params['pdodriver'] = $pdodriver;
+		if ($failover) $other_params['failover'] = $failover;
 
 		return $dsn.'?'.http_build_query($other_params);
 	}
diff --git a/tests/mocks/database/db/driver.php b/tests/mocks/database/db/driver.php
new file mode 100644
index 000000000..9bf5231e3
--- /dev/null
+++ b/tests/mocks/database/db/driver.php
@@ -0,0 +1,36 @@
+<?php
+
+class Mock_Database_DB_Driver extends CI_DB_driver {
+	
+	/**
+	 * @var object The actual Driver
+	 */
+	protected $ci_db_driver;
+
+	/**
+	 * Instantiate the database driver
+	 *
+	 * @param  string 	DB Driver class name
+	 * @param  array 	DB configuration to set
+	 * @return void
+	 */
+	public function __construct($driver_class, $config = array())
+	{
+		if (is_string($driver_class)) $this->ci_db_driver = new $driver_class($config);
+	}
+
+	/**
+	 * Overloading method, emulate the actual driver method (multiple inheritance workaround)
+	 */
+	public function __call($method, $arguments)
+	{
+		if ( ! is_callable(array($this->ci_db_driver, $method)))
+		{
+			throw new BadMethodCallException($method. ' not exists or not implemented');
+		}
+
+		return call_user_func_array(array($this->ci_db_driver, $method), $arguments);
+	}
+}
+
+class CI_DB extends CI_DB_Driver {}
\ No newline at end of file
diff --git a/tests/mocks/database/drivers/mysql.php b/tests/mocks/database/drivers/mysql.php
new file mode 100644
index 000000000..34a74e2bf
--- /dev/null
+++ b/tests/mocks/database/drivers/mysql.php
@@ -0,0 +1,16 @@
+<?php
+
+class Mock_Database_Drivers_Mysql extends Mock_Database_DB_Driver {
+	
+	/**
+	 * Instantiate the database driver
+	 *
+	 * @param  string 	DB Driver class name
+	 * @param  array 	DB configuration to set
+	 * @return void
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct('CI_DB_mysql_driver', $config);
+	}
+}
\ No newline at end of file
diff --git a/tests/mocks/database/drivers/pdo.php b/tests/mocks/database/drivers/pdo.php
new file mode 100644
index 000000000..590e19552
--- /dev/null
+++ b/tests/mocks/database/drivers/pdo.php
@@ -0,0 +1,16 @@
+<?php
+
+class Mock_Database_Drivers_PDO extends Mock_Database_DB_Driver {
+	
+	/**
+	 * Instantiate the database driver
+	 *
+	 * @param  string 	DB Driver class name
+	 * @param  array 	DB configuration to set
+	 * @return void
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct('CI_DB_pdo_driver', $config);
+	}
+}
\ No newline at end of file
diff --git a/tests/mocks/database/drivers/postgre.php b/tests/mocks/database/drivers/postgre.php
new file mode 100644
index 000000000..0df905963
--- /dev/null
+++ b/tests/mocks/database/drivers/postgre.php
@@ -0,0 +1,16 @@
+<?php
+
+class Mock_Database_Drivers_Postgre extends Mock_Database_DB_Driver {
+	
+	/**
+	 * Instantiate the database driver
+	 *
+	 * @param  string 	DB Driver class name
+	 * @param  array 	DB configuration to set
+	 * @return void
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct('CI_DB_postgre_driver', $config);
+	}
+}
\ No newline at end of file
diff --git a/tests/mocks/database/drivers/sqlite.php b/tests/mocks/database/drivers/sqlite.php
new file mode 100644
index 000000000..49c68c50f
--- /dev/null
+++ b/tests/mocks/database/drivers/sqlite.php
@@ -0,0 +1,16 @@
+<?php
+
+class Mock_Database_Drivers_Sqlite extends Mock_Database_DB_Driver {
+	
+	/**
+	 * Instantiate the database driver
+	 *
+	 * @param  string 	DB Driver class name
+	 * @param  array 	DB configuration to set
+	 * @return void
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct('CI_DB_sqlite_driver', $config);
+	}
+}
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 197251479b6c55d7fd65ef8f0eccc14450b1cbec Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Wed, 4 Apr 2012 23:46:23 +0700
Subject: Fix sqlite issue on PHP 5.4 both for native and PDO driver

---
 tests/mocks/database/config/ci_test.sqlite |  0
 tests/mocks/database/config/pdo/sqlite.php | 20 ++++++++++++++++----
 tests/mocks/database/db.php                | 13 +++----------
 3 files changed, 19 insertions(+), 14 deletions(-)
 delete mode 100644 tests/mocks/database/config/ci_test.sqlite

(limited to 'tests/mocks')

diff --git a/tests/mocks/database/config/ci_test.sqlite b/tests/mocks/database/config/ci_test.sqlite
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/mocks/database/config/pdo/sqlite.php b/tests/mocks/database/config/pdo/sqlite.php
index 1e5043b00..c68b4b213 100644
--- a/tests/mocks/database/config/pdo/sqlite.php
+++ b/tests/mocks/database/config/pdo/sqlite.php
@@ -4,20 +4,32 @@ return array(
 
 	// Typical Database configuration
 	'pdo/sqlite' => array(
-		'dsn' => 'sqlite:/'.realpath(__DIR__.'/..').'/ci_test.sqlite',
+		'dsn' => 'sqlite:/'.realpath(__DIR__.'/../..').'/ci_test.sqlite',
+		'hostname' => 'localhost',
+		'username' => 'sqlite',
+		'password' => 'sqlite',
+		'database' => 'sqlite',
 		'dbdriver' => 'pdo',
 		'pdodriver' => 'sqlite',
 	),
 
 	// Database configuration with failover
 	'pdo/sqlite_failover' => array(
-		'dsn' => 'sqlite:/'.realpath(__DIR__.'/..').'/not_exists.sqlite',
+		'dsn' => 'sqlite:not_exists.sqlite',
+		'hostname' => 'localhost',
+		'username' => 'sqlite',
+		'password' => 'sqlite',
+		'database' => 'sqlite',
 		'dbdriver' => 'pdo',
 		'pdodriver' => 'sqlite',
 		'failover' => array(
 			array(
-				'dsn' => 'sqlite:/'.realpath(__DIR__.'/..').'/ci_test.sqlite',
-				'dbdriver' => 'pdo',
+				'dsn' => 'sqlite:/'.realpath(__DIR__.'/../..').'/ci_test.sqlite',
+				'hostname' => 'localhost',
+				'username' => 'sqlite',
+				'password' => 'sqlite',
+				'database' => 'sqlite',
+				'dbdriver' => 'pdo', 
 				'pdodriver' => 'sqlite',
 			),
 		),
diff --git a/tests/mocks/database/db.php b/tests/mocks/database/db.php
index c30e6d2e6..59028ed9c 100644
--- a/tests/mocks/database/db.php
+++ b/tests/mocks/database/db.php
@@ -45,23 +45,16 @@ class Mock_Database_DB {
 		);
 
 		$config = array_merge($this->config[$group], $params);
+		$dsnstring = ( ! empty($config['dsn'])) ? $config['dsn'] : FALSE;
 		$pdodriver = ( ! empty($config['pdodriver'])) ? $config['pdodriver'] : FALSE;
 		$failover = ( ! empty($config['failover'])) ? $config['failover'] : FALSE;
 
-		if ( ! empty($config['dsn']))
-		{
-			$dsn = $config['dsn'];
-		}
-		else
-		{
-			$dsn = $config['dbdriver'].'://'.$config['username'].':'.$config['password']
+		$dsn = $config['dbdriver'].'://'.$config['username'].':'.$config['password']
 			       .'@'.$config['hostname'].'/'.$config['database'];
 
-		}
-
 		// Build the parameter
 		$other_params = array_slice($config, 6);
-		$other_params['dsn'] = $dsn;
+		if ($dsnstring) $other_params['dsn'] = $dsnstring;
 		if ($pdodriver) $other_params['pdodriver'] = $pdodriver;
 		if ($failover) $other_params['failover'] = $failover;
 
-- 
cgit v1.2.3-24-g4f1b


From 26490e37f4bdb267b71431abd79782549cbbadda Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Wed, 4 Apr 2012 23:50:00 +0700
Subject: Add branch to travis list

---
 tests/mocks/database/drivers/sqlite.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/mocks')

diff --git a/tests/mocks/database/drivers/sqlite.php b/tests/mocks/database/drivers/sqlite.php
index 49c68c50f..76a182cbf 100644
--- a/tests/mocks/database/drivers/sqlite.php
+++ b/tests/mocks/database/drivers/sqlite.php
@@ -11,6 +11,6 @@ class Mock_Database_Drivers_Sqlite extends Mock_Database_DB_Driver {
 	 */
 	public function __construct($config = array())
 	{
-		parent::__construct('CI_DB_sqlite_driver', $config);
+		parent::__construct('CI_DB_sqlite3_driver', $config);
 	}
 }
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 61ff054fb905f0514b942bf3e70a6c882bd64f7a Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Thu, 5 Apr 2012 01:23:56 +0700
Subject: Adding schema and initial Query Builder code coverage

---
 tests/mocks/autoloader.php             |   4 ++--
 tests/mocks/database/ci_test.sqlite    | Bin 17408 -> 17408 bytes
 tests/mocks/database/config/sqlite.php |   6 +++---
 tests/mocks/database/db/driver.php     |   2 +-
 tests/mocks/database/schema/.gitkeep   |   0
 5 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 tests/mocks/database/schema/.gitkeep

(limited to 'tests/mocks')

diff --git a/tests/mocks/autoloader.php b/tests/mocks/autoloader.php
index 22448139e..f1bdb5d6f 100644
--- a/tests/mocks/autoloader.php
+++ b/tests/mocks/autoloader.php
@@ -62,7 +62,7 @@ function autoload($class)
 		elseif (strpos($class, 'CI_DB') === 0)
 		{
 			$dir = BASEPATH.'database'.DIRECTORY_SEPARATOR;
-			$file = $dir.str_replace('CI_DB', 'DB', $subclass).'.php';
+			$file = $dir.str_replace(array('CI_DB','active_record'), array('DB', 'active_rec'), $subclass).'.php';
 		}
 		else
 		{
@@ -82,7 +82,7 @@ function autoload($class)
 		{
 			return FALSE;
 		}
-		var_dump($file);
+		
 	    throw new InvalidArgumentException("Unable to load $class.");
 	}
 
diff --git a/tests/mocks/database/ci_test.sqlite b/tests/mocks/database/ci_test.sqlite
index 37ce4f870..86d868af2 100755
Binary files a/tests/mocks/database/ci_test.sqlite and b/tests/mocks/database/ci_test.sqlite differ
diff --git a/tests/mocks/database/config/sqlite.php b/tests/mocks/database/config/sqlite.php
index c70986e7c..75fdacd96 100644
--- a/tests/mocks/database/config/sqlite.php
+++ b/tests/mocks/database/config/sqlite.php
@@ -9,7 +9,7 @@ return array(
 		'username' => 'sqlite',
 		'password' => 'sqlite',
 		'database' => realpath(__DIR__.'/..').'/ci_test.sqlite',
-		'dbdriver' => is_php('5.4') ? 'sqlite3' : 'sqlite',
+		'dbdriver' => 'sqlite3',
 	),
 
 	// Database configuration with failover
@@ -19,7 +19,7 @@ return array(
 		'username' => 'sqlite',
 		'password' => 'sqlite',
 		'database' => '../not_exists.sqlite',
-		'dbdriver' => is_php('5.4') ? 'sqlite3' : 'sqlite',
+		'dbdriver' => 'sqlite3',
 		'failover' => array(
 			array(
 				'dsn' => '',
@@ -27,7 +27,7 @@ return array(
 				'username' => 'sqlite',
 				'password' => 'sqlite',
 				'database' => realpath(__DIR__.'/..').'/ci_testf.sqlite',
-				'dbdriver' => is_php('5.4') ? 'sqlite3' : 'sqlite',
+				'dbdriver' => 'sqlite3',
 			),
 		),
 	),
diff --git a/tests/mocks/database/db/driver.php b/tests/mocks/database/db/driver.php
index 9bf5231e3..cb1820277 100644
--- a/tests/mocks/database/db/driver.php
+++ b/tests/mocks/database/db/driver.php
@@ -33,4 +33,4 @@ class Mock_Database_DB_Driver extends CI_DB_driver {
 	}
 }
 
-class CI_DB extends CI_DB_Driver {}
\ No newline at end of file
+class CI_DB extends Mock_Database_DB_QueryBuilder {}
\ No newline at end of file
diff --git a/tests/mocks/database/schema/.gitkeep b/tests/mocks/database/schema/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
-- 
cgit v1.2.3-24-g4f1b


From 5b421665bac7609192917f7b0f34838534be099e Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Thu, 5 Apr 2012 01:24:50 +0700
Subject: Simple query builder tests

---
 tests/mocks/database/db/querybuilder.php | 10 +++++
 tests/mocks/database/schema/skeleton.php | 65 ++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 tests/mocks/database/db/querybuilder.php
 create mode 100644 tests/mocks/database/schema/skeleton.php

(limited to 'tests/mocks')

diff --git a/tests/mocks/database/db/querybuilder.php b/tests/mocks/database/db/querybuilder.php
new file mode 100644
index 000000000..1b95c92af
--- /dev/null
+++ b/tests/mocks/database/db/querybuilder.php
@@ -0,0 +1,10 @@
+<?php
+
+if ( ! class_exists('CI_DB_query_builder'))
+{
+	class Mock_Database_DB_QueryBuilder extends CI_DB_active_record {}
+}
+else
+{
+	class Mock_Database_DB_QueryBuilder extends CI_DB_query_builder {}
+}
diff --git a/tests/mocks/database/schema/skeleton.php b/tests/mocks/database/schema/skeleton.php
new file mode 100644
index 000000000..bf9e75b45
--- /dev/null
+++ b/tests/mocks/database/schema/skeleton.php
@@ -0,0 +1,65 @@
+<?php
+
+class Mock_Database_Schema_Skeleton {
+	
+	/**
+	 * Create the dummy tables
+	 *
+	 * @return void
+	 */
+	public static function create_tables($forge)
+	{
+		// Job Table
+		$forge->add_field(array(
+			'id' => array(
+				'type' => 'INT',
+				'constraint' => 3,
+			),
+			'name' => array(
+				'type' => 'VARCHAR',
+				'constraint' => 40,
+			),
+			'description' => array(
+				'type' => 'TEXT',
+				'constraint' => 0,
+			),
+		));
+		$forge->add_key('id', TRUE);
+		$forge->create_table('job', TRUE);
+	}
+
+	/**
+	 * Create the dummy datas
+	 *
+	 * @return void
+	 */
+	public static function create_data($db)
+	{
+		// Job Data
+		$data = array(
+			'job' => array(
+				array('id' => 1, 'name' => 'Developer', 'description' => 'Awesome job, but sometimes makes you bored'), 
+				array('id' => 2, 'name' => 'Politician', 'description' => 'This is not really a job'),
+    			array('id' => 3, 'name' => 'Accountant', 'description' => 'Boring job, but you will get free snack at lunch'),
+			    array('id' => 4, 'name' => 'Musician', 'description' => 'Only Coldplay can actually called Musician'),
+			),
+		);
+
+		foreach ($data as $table => $dummy_data) 
+		{
+			$db->truncate($table);
+			
+			if (strpos(DB_DRIVER, 'sqlite') === FALSE)
+			{
+				$db->insert_batch($table, $dummy_data); 
+			}
+			else
+			{
+				foreach ($dummy_data as $single_dummy_data)
+				{
+					$db->insert($table, $single_dummy_data); 
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 55f804239cb0141fdac748607d8cdfa143efac92 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Thu, 5 Apr 2012 01:48:52 +0700
Subject: Add dsn to pgsql

---
 tests/mocks/database/config/pdo/pgsql.php | 4 ++--
 tests/mocks/database/config/sqlite.php    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/mocks')

diff --git a/tests/mocks/database/config/pdo/pgsql.php b/tests/mocks/database/config/pdo/pgsql.php
index b2f409d8d..5196e9ad9 100644
--- a/tests/mocks/database/config/pdo/pgsql.php
+++ b/tests/mocks/database/config/pdo/pgsql.php
@@ -4,7 +4,7 @@ return array(
 	
 	// Typical Database configuration
 	'pdo/pgsql' => array(
-		'dsn' => '',
+		'dsn' => 'pgsql:host=localhost;port=5432;dbname=ci_test;',
 		'hostname' => 'localhost',
 		'username' => 'postgres',
 		'password' => '',
@@ -24,7 +24,7 @@ return array(
 		'pdodriver' => 'pgsql',
 		'failover' => array(
 			array(
-				'dsn' => '',
+				'dsn' => 'pgsql:host=localhost;port=5432;dbname=ci_test;',
 				'hostname' => 'localhost',
 				'username' => 'postgres',
 				'password' => '',
diff --git a/tests/mocks/database/config/sqlite.php b/tests/mocks/database/config/sqlite.php
index 75fdacd96..755ce2a3a 100644
--- a/tests/mocks/database/config/sqlite.php
+++ b/tests/mocks/database/config/sqlite.php
@@ -26,7 +26,7 @@ return array(
 				'hostname' => 'localhost',
 				'username' => 'sqlite',
 				'password' => 'sqlite',
-				'database' => realpath(__DIR__.'/..').'/ci_testf.sqlite',
+				'database' => realpath(__DIR__.'/..').'/ci_test.sqlite',
 				'dbdriver' => 'sqlite3',
 			),
 		),
-- 
cgit v1.2.3-24-g4f1b


From 024098d05d00383bf82165e1f8bbadb53cbcaa9b Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Thu, 5 Apr 2012 01:51:57 +0700
Subject: Use more user-friendly method for dummy create data

---
 tests/mocks/database/schema/skeleton.php | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'tests/mocks')

diff --git a/tests/mocks/database/schema/skeleton.php b/tests/mocks/database/schema/skeleton.php
index bf9e75b45..53df73bdd 100644
--- a/tests/mocks/database/schema/skeleton.php
+++ b/tests/mocks/database/schema/skeleton.php
@@ -48,17 +48,10 @@ class Mock_Database_Schema_Skeleton {
 		foreach ($data as $table => $dummy_data) 
 		{
 			$db->truncate($table);
-			
-			if (strpos(DB_DRIVER, 'sqlite') === FALSE)
-			{
-				$db->insert_batch($table, $dummy_data); 
-			}
-			else
+
+			foreach ($dummy_data as $single_dummy_data)
 			{
-				foreach ($dummy_data as $single_dummy_data)
-				{
-					$db->insert($table, $single_dummy_data); 
-				}
+				$db->insert($table, $single_dummy_data); 
 			}
 		}
 	}
-- 
cgit v1.2.3-24-g4f1b


From 1bfc0d9a2b47be1a2a0b8efda60ebdd9d7a303dd Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Thu, 5 Apr 2012 02:25:25 +0700
Subject: Fix postgre table datatype

---
 tests/mocks/database/schema/skeleton.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/mocks')

diff --git a/tests/mocks/database/schema/skeleton.php b/tests/mocks/database/schema/skeleton.php
index 53df73bdd..47e8bfd35 100644
--- a/tests/mocks/database/schema/skeleton.php
+++ b/tests/mocks/database/schema/skeleton.php
@@ -12,7 +12,7 @@ class Mock_Database_Schema_Skeleton {
 		// Job Table
 		$forge->add_field(array(
 			'id' => array(
-				'type' => 'INT',
+				'type' => 'INTEGER',
 				'constraint' => 3,
 			),
 			'name' => array(
@@ -21,11 +21,11 @@ class Mock_Database_Schema_Skeleton {
 			),
 			'description' => array(
 				'type' => 'TEXT',
-				'constraint' => 0,
 			),
 		));
 		$forge->add_key('id', TRUE);
-		$forge->create_table('job', TRUE);
+		$res = $forge->create_table('job');
+		var_dump($res);
 	}
 
 	/**
-- 
cgit v1.2.3-24-g4f1b


From b0703b0bee89ab0eae83bae78daad5c5a3504043 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Thu, 5 Apr 2012 02:31:52 +0700
Subject: Resolve postgres issue on create table

---
 tests/mocks/database/schema/skeleton.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'tests/mocks')

diff --git a/tests/mocks/database/schema/skeleton.php b/tests/mocks/database/schema/skeleton.php
index 47e8bfd35..6610d6b59 100644
--- a/tests/mocks/database/schema/skeleton.php
+++ b/tests/mocks/database/schema/skeleton.php
@@ -7,7 +7,7 @@ class Mock_Database_Schema_Skeleton {
 	 *
 	 * @return void
 	 */
-	public static function create_tables($forge)
+	public static function create_tables($forge, $driver)
 	{
 		// Job Table
 		$forge->add_field(array(
@@ -24,8 +24,7 @@ class Mock_Database_Schema_Skeleton {
 			),
 		));
 		$forge->add_key('id', TRUE);
-		$res = $forge->create_table('job');
-		var_dump($res);
+		$forge->create_table('job', (strpos($driver, 'pgsql') === FALSE));
 	}
 
 	/**
-- 
cgit v1.2.3-24-g4f1b


From 55f622f76371949ae615ccdff76ed1e4bab55170 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Thu, 5 Apr 2012 19:01:34 +0700
Subject: Add select clause test

---
 tests/mocks/database/schema/skeleton.php | 55 ++++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 7 deletions(-)

(limited to 'tests/mocks')

diff --git a/tests/mocks/database/schema/skeleton.php b/tests/mocks/database/schema/skeleton.php
index 6610d6b59..a3d5bac65 100644
--- a/tests/mocks/database/schema/skeleton.php
+++ b/tests/mocks/database/schema/skeleton.php
@@ -1,16 +1,57 @@
 <?php
 
 class Mock_Database_Schema_Skeleton {
+
+	/**
+	 * @var object Database Holder
+	 */
+	public static $db;
+
+	/**
+	 * @var object Forge Holder
+	 */
+	public static $forge;
+
+	/**
+	 * @var object Driver Holder
+	 */
+	public static $driver;
+
+	/**
+	 * Initialize both database and forge components
+	 */
+	public static function init($driver)
+	{
+		if (empty(static::$db) && empty(static::$forge))
+		{
+			$config = Mock_Database_DB::config($driver);
+			$connection = new Mock_Database_DB($config);
+			$db = Mock_Database_DB::DB($connection->set_dsn($driver), TRUE);
+
+			CI_TestCase::instance()->ci_instance_var('db', $db);
+
+			$loader = new Mock_Core_Loader();
+			$loader->dbforge();
+			$forge = CI_TestCase::instance()->ci_instance_var('dbforge');
+
+			static::$db = $db;
+			static::$forge = $forge;
+			static::$driver = $driver;
+		}
+
+		return static::$db;
+	}
+	
 	
 	/**
 	 * Create the dummy tables
 	 *
 	 * @return void
 	 */
-	public static function create_tables($forge, $driver)
+	public static function create_tables()
 	{
 		// Job Table
-		$forge->add_field(array(
+		static::$forge->add_field(array(
 			'id' => array(
 				'type' => 'INTEGER',
 				'constraint' => 3,
@@ -23,8 +64,8 @@ class Mock_Database_Schema_Skeleton {
 				'type' => 'TEXT',
 			),
 		));
-		$forge->add_key('id', TRUE);
-		$forge->create_table('job', (strpos($driver, 'pgsql') === FALSE));
+		static::$forge->add_key('id', TRUE);
+		static::$forge->create_table('job', (strpos(static::$driver, 'pgsql') === FALSE));
 	}
 
 	/**
@@ -32,7 +73,7 @@ class Mock_Database_Schema_Skeleton {
 	 *
 	 * @return void
 	 */
-	public static function create_data($db)
+	public static function create_data()
 	{
 		// Job Data
 		$data = array(
@@ -46,11 +87,11 @@ class Mock_Database_Schema_Skeleton {
 
 		foreach ($data as $table => $dummy_data) 
 		{
-			$db->truncate($table);
+			static::$db->truncate($table);
 
 			foreach ($dummy_data as $single_dummy_data)
 			{
-				$db->insert($table, $single_dummy_data); 
+				static::$db->insert($table, $single_dummy_data); 
 			}
 		}
 	}
-- 
cgit v1.2.3-24-g4f1b