Add quickstart docs for Active Record and SqlMap

9 files changed, 233 insertions, 152 deletions

diff --git a/demos/time-tracker/protected/App_Code/Dao/ReportsDao.php b/demos/time-tracker/protected/App_Code/Dao/ReportsDao.php
index 3e5b6456..15d0c2a3 100644
--- a/demos/time-tracker/protected/App_Code/Dao/ReportsDao.php
+++ b/demos/time-tracker/protected/App_Code/Dao/ReportsDao.php
@@ -72,6 +72,7 @@ class ReportsDao extends BaseDao
 	{

 		$sqlmap = $this->getSqlMap();

 		$ids = implode(',', array_map('intval', $projects));

+		$sqlmap->getDbConnection()->setActive(true); //db connection needs to be open for quoteString

 		$usernames = implode(',', array_map(array($sqlmap->getDbConnection(), 'quoteString'), $users));

 

 		$param['projects'] = $ids;

diff --git a/demos/time-tracker/protected/App_Data/MySQL4/projects.xml b/demos/time-tracker/protected/App_Data/MySQL4/projects.xml
index 099e7fef..bcac9480 100644
--- a/demos/time-tracker/protected/App_Data/MySQL4/projects.xml
+++ b/demos/time-tracker/protected/App_Data/MySQL4/projects.xml
@@ -5,9 +5,9 @@
 	<result property="ID" column="ProjectID" type="integer"/>

 	<result property="Name" column="Name" />

 	<result property="Description" column="Description" />

-	<result property="DateCreated" column="CreationDate" typeHandler="DateTime" />

+	<result property="DateCreated" column="CreationDate" typeHandler="DateTimeTypeHandler" />

 	<result property="EstimateDuration" column="EstimateDuration" type="float" />

-	<result property="CompletionDate" column="CompletionDate" typeHandler="DateTime" />

+	<result property="CompletionDate" column="CompletionDate" typeHandler="DateTimeTypeHandler" />

 	<result property="CreatorUserName" column="CreatorID" />

 	<result property="ManagerUserName" column="ManagerID" />

 	<result property="ActualDuration" column="ActualDuration" type="float" />

@@ -22,7 +22,7 @@
 	(Name, Description, CreationDate, EstimateDuration, CompletionDate, CreatorID, ManagerID)

 	VALUES

 	(#Name#, #Description#, NOW(), #EstimateDuration#,

-		#CompletionDate, typeHandler=DateTime#, 

+		#CompletionDate, typeHandler=DateTimeTypeHandler#, 

 		#CreatorUserName#, #ManagerUserName#)

 	<selectKey property="ID" type="post" resultClass="int">

 		select LAST_INSERT_ID() as value

@@ -62,6 +62,7 @@
 		project.CompletionDate as CompletionDate,

 		project.CreatorID as CreatorID,

 		project.ManagerID as ManagerID,

+		project.ManagerID as ManagerUserName,

 		SUM(time_entry.Duration) as ActualDuration

 	FROM project

 		LEFT JOIN categories ON project.ProjectID = categories.ProjectID

@@ -144,7 +145,7 @@
 <update id="UpdateProject" parameterClass="ProjectRecord">

 	UPDATE project

 	SET 

-		CompletionDate = #CompletionDate, typeHandler=DateTime#,

+		CompletionDate = #CompletionDate, typeHandler=DateTimeTypeHandler#,

 		Description = #Description#,

 		EstimateDuration = #EstimateDuration#,

 		ManagerId =#ManagerUserName#,

diff --git a/demos/time-tracker/protected/App_Data/MySQL4/time-tracker-mysql.sql b/demos/time-tracker/protected/App_Data/MySQL4/time-tracker-mysql.sql
index bb120fc4..91481efe 100644
--- a/demos/time-tracker/protected/App_Data/MySQL4/time-tracker-mysql.sql
+++ b/demos/time-tracker/protected/App_Data/MySQL4/time-tracker-mysql.sql
@@ -1,136 +1,227 @@
-DROP TABLE IF EXISTS user_roles;

-CREATE TABLE user_roles (

-  UserID varchar(50) NOT NULL,

-  RoleType varchar(50) NOT NULL,

-  PRIMARY KEY  (UserID,RoleType),

-  KEY RoleType (RoleType)

+-- 

+-- Database: `time-tracker`

+-- 

+

+-- --------------------------------------------------------

+

+-- 

+-- Table structure for table `categories`

+-- 

+

+CREATE TABLE IF NOT EXISTS `categories` (

+  `CategoryID` int(11) NOT NULL auto_increment,

+  `Name` varchar(255) NOT NULL,

+  `ProjectID` int(11) NOT NULL,

+  `ParentCategoryID` int(11) default '0',

+  `Abbreviation` varchar(255) default NULL,

+  `EstimateDuration` float(10,2) default '0.00',

+  PRIMARY KEY  (`CategoryID`),

+  UNIQUE KEY `UniqueNamePerProject` (`Name`,`ProjectID`),

+  KEY `ProjectID` (`ProjectID`)

 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

 

-DROP TABLE IF EXISTS role_types;

-CREATE TABLE role_types (

-  RoleType varchar(50) NOT NULL,

-  Description varchar(255) NOT NULL,

-  PRIMARY KEY  (RoleType)

+-- 

+-- Dumping data for table `categories`

+-- 

+

+

+-- --------------------------------------------------------

+

+-- 

+-- Table structure for table `project`

+-- 

+

+CREATE TABLE IF NOT EXISTS `project` (

+  `ProjectID` int(11) NOT NULL auto_increment,

+  `Name` varchar(255) NOT NULL,

+  `Description` varchar(255) default NULL,

+  `CreationDate` datetime NOT NULL,

+  `CompletionDate` datetime NOT NULL,

+  `Disabled` tinyint(1) NOT NULL default '0',

+  `EstimateDuration` float(10,2) NOT NULL default '0.00',

+  `CreatorID` varchar(50) NOT NULL,

+  `ManagerID` varchar(50) default NULL,

+  PRIMARY KEY  (`ProjectID`),

+  KEY `Name` (`Name`),

+  KEY `CreatorID` (`CreatorID`),

+  KEY `ManagerID` (`ManagerID`)

 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

 

-DROP TABLE IF EXISTS project_members;

-CREATE TABLE project_members (

-  UserID varchar(50) NOT NULL,

-  ProjectID int(11) NOT NULL,

-  PRIMARY KEY  (UserID,ProjectID),

-  KEY ProjectID (ProjectID)

+-- 

+-- Dumping data for table `project`

+-- 

+

+

+-- --------------------------------------------------------

+

+-- 

+-- Table structure for table `project_members`

+-- 

+

+CREATE TABLE IF NOT EXISTS `project_members` (

+  `UserID` varchar(50) NOT NULL,

+  `ProjectID` int(11) NOT NULL,

+  PRIMARY KEY  (`UserID`,`ProjectID`),

+  KEY `ProjectID` (`ProjectID`)

 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

 

-DROP TABLE IF EXISTS time_entry;

-CREATE TABLE time_entry (

-  EntryID int(11) NOT NULL auto_increment,

-  EntryCreated datetime NOT NULL,

-  Duration float(10,2) NOT NULL default '0.00',

-  Description varchar(1000) default NULL,

-  CategoryID int(11) NOT NULL default '0',

-  EntryDate datetime default NULL,

-  CreatorID varchar(50) NOT NULL,

-  UserID varchar(50) NOT NULL,

-  PRIMARY KEY  (EntryID),

-  KEY CategoryID (CategoryID),

-  KEY CreatorID (CreatorID),

-  KEY UserID (UserID)

-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

-

-DROP TABLE IF EXISTS signon;

-CREATE TABLE signon (

-  SessionToken varchar(32) NOT NULL,

-  Username varchar(50) NOT NULL,

-  LastSignOnDate datetime NOT NULL,

-  PRIMARY KEY  (SessionToken),

-  KEY Username (Username)

+-- 

+-- Dumping data for table `project_members`

+-- 

+

+

+-- --------------------------------------------------------

+

+-- 

+-- Table structure for table `role_types`

+-- 

+

+CREATE TABLE IF NOT EXISTS `role_types` (

+  `RoleType` varchar(50) NOT NULL,

+  `Description` varchar(255) NOT NULL,

+  PRIMARY KEY  (`RoleType`)

 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

 

-DROP TABLE IF EXISTS categories;

-CREATE TABLE categories (

-  CategoryID int(11) NOT NULL auto_increment,

-  `Name` varchar(255) NOT NULL,

-  ProjectID int(11) NOT NULL,

-  ParentCategoryID int(11) default '0',

-  Abbreviation varchar(255) default NULL,

-  EstimateDuration float(10,2) default '0.00',

-  PRIMARY KEY  (CategoryID),

-  UNIQUE KEY UniqueNamePerProject (`Name`,ProjectID),

-  KEY ProjectID (ProjectID)

-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

-

-DROP TABLE IF EXISTS project;

-CREATE TABLE project (

-  ProjectID int(11) NOT NULL auto_increment,

-  `Name` varchar(255) NOT NULL,

-  Description varchar(255) default NULL,

-  CreationDate datetime NOT NULL,

-  CompletionDate datetime NOT NULL,

-  Disabled tinyint(1) NOT NULL default '0',

-  EstimateDuration float(10,2) NOT NULL default '0.00',

-  CreatorID varchar(50) NOT NULL,

-  ManagerID varchar(50) default NULL,

-  PRIMARY KEY  (ProjectID),

-  KEY `Name` (`Name`),

-  KEY CreatorID (CreatorID),

-  KEY ManagerID (ManagerID)

-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

+-- 

+-- Dumping data for table `role_types`

+-- 

+

+INSERT INTO `role_types` (`RoleType`, `Description`) VALUES ('admin', 'Project administrator may additionally view the list of all users.'),

+('consultant', 'Consultant may log time entries only.'),

+('manager', 'Project manager may additionally edit all projects and view reports.');

+

+-- --------------------------------------------------------

+

+-- 

+-- Table structure for table `signon`

+-- 

+

+CREATE TABLE IF NOT EXISTS `signon` (

+  `SessionToken` varchar(32) NOT NULL,

+  `Username` varchar(50) NOT NULL,

+  `LastSignOnDate` datetime NOT NULL,

+  PRIMARY KEY  (`SessionToken`),

+  KEY `Username` (`Username`)

+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

+

+-- 

+-- Dumping data for table `signon`

+-- 

+

+

+-- --------------------------------------------------------

+

+-- 

+-- Table structure for table `time_entry`

+-- 

+

+CREATE TABLE IF NOT EXISTS `time_entry` (

+  `EntryID` int(11) NOT NULL auto_increment,

+  `EntryCreated` datetime NOT NULL,

+  `Duration` float(10,2) NOT NULL default '0.00',

+  `Description` varchar(1000) default NULL,

+  `CategoryID` int(11) NOT NULL default '0',

+  `EntryDate` datetime default NULL,

+  `CreatorID` varchar(50) NOT NULL,

+  `UserID` varchar(50) NOT NULL,

+  PRIMARY KEY  (`EntryID`),

+  KEY `CategoryID` (`CategoryID`),

+  KEY `CreatorID` (`CreatorID`),

+  KEY `UserID` (`UserID`)

+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

+

+-- 

+-- Dumping data for table `time_entry`

+-- 

+

+

+-- --------------------------------------------------------

+

+-- 

+-- Table structure for table `user_roles`

+-- 

+

+CREATE TABLE IF NOT EXISTS `user_roles` (

+  `UserID` varchar(50) NOT NULL,

+  `RoleType` varchar(50) NOT NULL,

+  PRIMARY KEY  (`UserID`,`RoleType`),

+  KEY `RoleType` (`RoleType`)

+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

+

+-- 

+-- Dumping data for table `user_roles`

+-- 

+

+INSERT INTO `user_roles` (`UserID`, `RoleType`) VALUES ('admin', 'admin'),

+('admin', 'consultant'),

+('consultant', 'consultant'),

+('manager', 'consultant'),

+('admin', 'manager'),

+('manager', 'manager');

 

-DROP TABLE IF EXISTS users;

-CREATE TABLE users (

-  Username varchar(50) NOT NULL,

+-- --------------------------------------------------------

+

+-- 

+-- Table structure for table `users`

+-- 

+

+CREATE TABLE IF NOT EXISTS `users` (

+  `Username` varchar(50) NOT NULL,

   `Password` varchar(50) NOT NULL,

-  EmailAddress varchar(100) NOT NULL,

-  Disabled tinyint(1) NOT NULL default '0',

-  PRIMARY KEY  (Username)

+  `EmailAddress` varchar(100) NOT NULL,

+  `Disabled` tinyint(1) NOT NULL default '0',

+  PRIMARY KEY  (`Username`)

 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

 

+-- 

+-- Dumping data for table `users`

+-- 

+

+INSERT INTO `users` (`Username`, `Password`, `EmailAddress`, `Disabled`) VALUES ('admin', '21232f297a57a5a743894a0e4a801fc3', 'admin@pradosoft.com', 0),

+('consultant', '7adfa4f2ba9323e6c1e024de375434b0', 'consultant@pradosoft.com', 0),

+('manager', '1d0258c2440a8d19e716292b231e3190', 'manager@pradosoft.com', 0);

+

+-- 

+-- Constraints for dumped tables

+-- 

+

+-- 

+-- Constraints for table `categories`

+-- 

 ALTER TABLE `categories`

-  ADD CONSTRAINT categories_ibfk_1 

-  	FOREIGN KEY (ProjectID) REFERENCES project (ProjectID);

+  ADD CONSTRAINT `categories_ibfk_1` FOREIGN KEY (`ProjectID`) REFERENCES `project` (`ProjectID`) ON DELETE CASCADE;

 

+-- 

+-- Constraints for table `project`

+-- 

 ALTER TABLE `project`

-  ADD CONSTRAINT project_ibfk_2 

-  	FOREIGN KEY (ManagerID) REFERENCES users (Username),

-  ADD CONSTRAINT project_ibfk_1 

-  	FOREIGN KEY (CreatorID) REFERENCES users (Username);

+  ADD CONSTRAINT `project_ibfk_6` FOREIGN KEY (`ManagerID`) REFERENCES `users` (`Username`),

+  ADD CONSTRAINT `project_ibfk_5` FOREIGN KEY (`CreatorID`) REFERENCES `users` (`Username`);

 

+-- 

+-- Constraints for table `project_members`

+-- 

 ALTER TABLE `project_members`

-  ADD CONSTRAINT project_members_ibfk_1 

-  	FOREIGN KEY (UserID) REFERENCES users (Username),

-  ADD CONSTRAINT project_members_ibfk_2 

-  	FOREIGN KEY (ProjectID) REFERENCES project (ProjectID);

+  ADD CONSTRAINT `project_members_ibfk_6` FOREIGN KEY (`ProjectID`) REFERENCES `project` (`ProjectID`) ON DELETE CASCADE,

+  ADD CONSTRAINT `project_members_ibfk_5` FOREIGN KEY (`UserID`) REFERENCES `users` (`Username`) ON DELETE CASCADE;

 

+-- 

+-- Constraints for table `signon`

+-- 

 ALTER TABLE `signon`

-  ADD CONSTRAINT signon_ibfk_1 

-  	FOREIGN KEY (Username) REFERENCES users (Username);

+  ADD CONSTRAINT `signon_ibfk_1` FOREIGN KEY (`Username`) REFERENCES `users` (`Username`);

 

+-- 

+-- Constraints for table `time_entry`

+-- 

 ALTER TABLE `time_entry`

-  ADD CONSTRAINT time_entry_ibfk_2 

-  	FOREIGN KEY (UserID) REFERENCES users (Username),

-  ADD CONSTRAINT time_entry_ibfk_1 

-  	FOREIGN KEY (CategoryID) REFERENCES categories (CategoryID);

+  ADD CONSTRAINT `time_entry_ibfk_8` FOREIGN KEY (`UserID`) REFERENCES `users` (`Username`),

+  ADD CONSTRAINT `time_entry_ibfk_6` FOREIGN KEY (`CategoryID`) REFERENCES `categories` (`CategoryID`) ON DELETE CASCADE,

+  ADD CONSTRAINT `time_entry_ibfk_7` FOREIGN KEY (`CreatorID`) REFERENCES `users` (`Username`);

 

+-- 

+-- Constraints for table `user_roles`

+-- 

 ALTER TABLE `user_roles`

-  ADD CONSTRAINT user_roles_ibfk_2 

-  	FOREIGN KEY (RoleType) REFERENCES role_types (RoleType),

-  ADD CONSTRAINT user_roles_ibfk_1 

-  	FOREIGN KEY (UserID) REFERENCES users (Username);

-

-INSERT INTO role_types (RoleType, Description) VALUES 

-('admin', 'Project administrator may additionally view the list of all users.'),

-('consultant', 'Consultant may log time entries only.'),

-('manager', 'Project manager may additionally edit all projects and view reports.');

-

-INSERT INTO users (Username, Password, EmailAddress, Disabled) VALUES 

-('admin', '21232f297a57a5a743894a0e4a801fc3', 'admin@pradosoft.com', 0),

-('manager', '1d0258c2440a8d19e716292b231e3190', 'manager@pradosoft.com', 0),

-('consultant', '7adfa4f2ba9323e6c1e024de375434b0', 'consultant@pradosoft.com', 0);

-

-INSERT INTO user_roles (UserID, RoleType) VALUES 

-('admin', 'admin'),

-('admin', 'manager'),

-('admin', 'consultant'),

-('manager', 'manager'),

-('manager', 'consultant'),

-('consultant', 'consultant');
\ No newline at end of file
+  ADD CONSTRAINT `user_roles_ibfk_2` FOREIGN KEY (`RoleType`) REFERENCES `role_types` (`RoleType`),

+  ADD CONSTRAINT `user_roles_ibfk_1` FOREIGN KEY (`UserID`) REFERENCES `users` (`Username`);

diff --git a/demos/time-tracker/protected/App_Data/mysql4-sqlmap.xml b/demos/time-tracker/protected/App_Data/mysql4-sqlmap.xml
index 84468044..ff7f636e 100644
--- a/demos/time-tracker/protected/App_Data/mysql4-sqlmap.xml
+++ b/demos/time-tracker/protected/App_Data/mysql4-sqlmap.xml
@@ -1,29 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>

 <sqlMapConfig>

-	

-	<typeHandlers>

-		<typeHandler type="TimeTrackerUser" 

-			callback="TimeTrackerUserTypeHandler"/>

-		<typeHandler type="DateTime" 

-			callback="DateTimeTypeHandler" />

-	</typeHandlers>

+		

+	<typeHandler type="TimeTrackerUser" class="TimeTrackerUserTypeHandler"/>

+	<typeHandler type="DateTime" class="DateTimeTypeHandler" />

 

-	

-    <provider class="TAdodb">

-        <datasource 

-        	driver="mysql"

-        	username="time-tracker"

-        	password="prado"

-        	host="localhost"

-        	database="time-tracker" />

-    </provider>

-    

-    <sqlMaps>

-        <sqlMap resource="MySQL4/users.xml"/>

-		<sqlMap resource="MySQL4/projects.xml"/>

-		<sqlMap resource="MySQL4/category.xml" />

-		<sqlMap resource="MySQL4/time-entry.xml" />

-		<sqlMap resource="MySQL4/reports.xml" />

-    </sqlMaps>

+	<connection class="TDbConnection"

+		ConnectionString="mysql:host=localhost;dbname=time-tracker"

+		Username="time-tracker" Password="prado" />

+

+	<sqlMap resource="MySQL4/users.xml"/>

+	<sqlMap resource="MySQL4/projects.xml"/>

+	<sqlMap resource="MySQL4/category.xml" />

+	<sqlMap resource="MySQL4/time-entry.xml" />

+	<sqlMap resource="MySQL4/reports.xml" />

     

 </sqlMapConfig>
\ No newline at end of file
diff --git a/demos/time-tracker/protected/application.xml b/demos/time-tracker/protected/application.xml
index bae5f126..d9e4d01c 100644
--- a/demos/time-tracker/protected/application.xml
+++ b/demos/time-tracker/protected/application.xml
@@ -17,7 +17,7 @@
 	<module id="cache" class="System.Caching.TMemCache" />

 -->

 	<module id="daos" class="DaoManager" EnableCache="true"

-  		configFile="Application.App_Data.sqlite-sqlmap">

+  		configFile="Application.App_Data.mysql4-sqlmap">

 		<dao id="UserDao" class="Application.App_Code.Dao.UserDao" />

 		<dao id="ProjectDao" class="Application.App_Code.Dao.ProjectDao" />

 		<dao id="TimeEntryDao" class="Application.App_Code.Dao.TimeEntryDao" />

diff --git a/demos/time-tracker/protected/pages/TimeTracker/ProjectList.php b/demos/time-tracker/protected/pages/TimeTracker/ProjectList.php
index eb92dcb7..4e3ac485 100644
--- a/demos/time-tracker/protected/pages/TimeTracker/ProjectList.php
+++ b/demos/time-tracker/protected/pages/TimeTracker/ProjectList.php
@@ -9,7 +9,7 @@ class ProjectList extends TPage
 		$this->projectList->dataBind();

 	}

 	

-	protected function getSortOrder($sort)

+	protected function getSortOrdering($sort)

 	{

 		$ordering = $this->getViewState('SortOrder', array());

 		$order = isset($ordering[$sort]) ? $ordering[$sort] : 'DESC';

@@ -21,7 +21,7 @@ class ProjectList extends TPage
 	protected function sortProjects($sender, $param)

 	{

 		$sort = $param->SortExpression;

-		$this->showProjects($sort, $this->getSortOrder($sort));

+		$this->showProjects($sort, $this->getSortOrdering($sort));

 	}

 		

 	public function onLoad($param)

diff --git a/demos/time-tracker/tests/unit/BaseTestCase.php b/demos/time-tracker/tests/unit/BaseTestCase.php
index 7e4520f8..d72cbc5c 100644
--- a/demos/time-tracker/tests/unit/BaseTestCase.php
+++ b/demos/time-tracker/tests/unit/BaseTestCase.php
@@ -42,7 +42,7 @@ class BaseTestCase extends UnitTestCase
 	function flushMySQLDatabase()

 	{

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

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

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

 		if(is_file($file))

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

 		else

@@ -57,7 +57,7 @@ class BaseTestCase extends UnitTestCase
 		{

 			$line = trim($line);

 			if(strlen($line) > 0)

-				$connection->execute($line);

+				$connection->createCommand($line)->execute();

 		}

 	}

 }

diff --git a/demos/time-tracker/tests/unit/ProjectDaoTestCase.php b/demos/time-tracker/tests/unit/ProjectDaoTestCase.php
index 3ccb28e2..22a01fca 100644
--- a/demos/time-tracker/tests/unit/ProjectDaoTestCase.php
+++ b/demos/time-tracker/tests/unit/ProjectDaoTestCase.php
@@ -113,11 +113,11 @@ class ProjectDaoTestCase extends BaseTestCase
 		try

 		{

 			$this->projectDao->addUserToProject($project->ID, 'asd');

-			$this->pass();

+			$this->fail();

 		}

-		catch(TSqlMapQueryExecutionException $e)

+		catch(TDbException $e)

 		{

-			$this->fail();

+			$this->pass();

 		}

 	}

 

diff --git a/demos/time-tracker/tests/unit/UserDaoTestCase.php b/demos/time-tracker/tests/unit/UserDaoTestCase.php
index 404dd9e2..d216dbe6 100644
--- a/demos/time-tracker/tests/unit/UserDaoTestCase.php
+++ b/demos/time-tracker/tests/unit/UserDaoTestCase.php
@@ -175,11 +175,11 @@ class UserDaoTestCase extends BaseTestCase
 		try

 		{

 			$this->userDao->updateUserRoles($user);

-			$this->pass();

+			$this->fail();

 		}

-		catch(TDataMapperException $e)

+		catch(TDbException $e)

 		{

-			$this->fail();

+			$this->pass();

 		}

 		

 		$check = $this->sqlmap->queryForObject('GetUserByName', 'user1');