Add TDataSourceConfig, TSqlMapConfig, TActiveRecordConfig

1 files changed, 19 insertions, 14 deletions

diff --git a/demos/time-tracker/tests/unit/BaseTestCase.php b/demos/time-tracker/tests/unit/BaseTestCase.php
index 549229e3..7e4520f8 100644
--- a/demos/time-tracker/tests/unit/BaseTestCase.php
+++ b/demos/time-tracker/tests/unit/BaseTestCase.php
@@ -6,44 +6,49 @@ Prado::using('Application.App_Code.Dao.*');
 class BaseTestCase extends UnitTestCase

 {

 	protected $sqlmap;

-	

+

 	function setup()

 	{

 		$app = Prado::getApplication();

-		$this->sqlmap = $app->getModule('daos')->getConnection();

+		$this->sqlmap = $app->getModule('daos')->getClient();

 	}

-	

-	

+

+

 	function flushDatabase()

 	{

-		$conn = $this->sqlmap->openConnection();

-		switch(strtolower($conn->getProvider()->getDriver()))

+		$conn = $this->sqlmap->getDbConnection();

+		$find = 'sqlite:protected';

+		if(is_int(strpos($conn->getConnectionString(),$find)))

+			$conn->ConnectionString = str_replace($find, 'sqlite:../protected', $conn->ConnectionString);

+		$conn->setActive(false);

+		$conn->setActive(true);

+		switch(strtolower($conn->getDriverName()))

 		{

 			case 'mysql':

 			return $this->flushMySQLDatabase();

 			case 'sqlite':

-			return $this->flushSQLiteDatabase(); 

-		}		

+			return $this->flushSQLiteDatabase();

+		}

 	}

-	

+

 	function flushSQLiteDatabase()

 	{

-		$conn = $this->sqlmap->openConnection();

-		$file = $conn->getProvider()->getHost();

+		$conn = $this->sqlmap->getDbConnection();

+		$file = str_replace('sqlite:','',$conn->getConnectionString());

 		$backup = $file.'.bak';

 		copy($backup, $file);

 	}

-	

+

 	function flushMySQLDatabase()

 	{

-		$conn = $this->sqlmap->openConnection();

+		$conn = $this->sqlmap->getDbConnection();

 		$file = Prado::getPathOfNamespace('Application.App_Data.mysql-reset','.sql');

 		if(is_file($file))

 			$this->runScript($conn, $file);

 		else

 			throw new Exception('unable to find script file '.$file);

 	}

-	

+

 	protected function runScript($connection, $script)

 	{

 		$sql = file_get_contents($script);