From cfb6ed4cdab1aaac63cfa153f3020dc5b27c5b96 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 13 Dec 2011 22:11:06 -0500
Subject: [PATCH] Fix failing tests.

---
 .../Model/Datasource/Database/MysqlTest.php    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
index 5453024a00e..fc457a14275 100644
--- a/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
+++ b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
@@ -3485,18 +3485,21 @@ public function testExceptionOnBrokenConnection() {
 	public function testUpdateStatements() {
 		$this->loadFixtures('Article', 'User');
 		$test = ConnectionManager::getDatasource('test');
+		$db = $test->config['database'];
 
 		$this->Dbo = $this->getMock('Mysql', array('execute'), array($test->config));
 
 		$this->Dbo->expects($this->at(0))->method('execute')
-			->with("UPDATE `articles` SET `field1` = 'value1'  WHERE 1 = 1");
+			->with("UPDATE `$db`.`articles` SET `field1` = 'value1'  WHERE 1 = 1");
 
 		$this->Dbo->expects($this->at(1))->method('execute')
-			->with("UPDATE `articles` AS `Article` LEFT JOIN `users` AS `User` ON (`Article`.`user_id` = `User`.`id`)" .
+			->with("UPDATE `$db`.`articles` AS `Article` LEFT JOIN `$db`.`users` AS `User` ON " . 
+				"(`Article`.`user_id` = `User`.`id`)" .
 				" SET `Article`.`field1` = 2  WHERE 2=2");
 
 		$this->Dbo->expects($this->at(2))->method('execute')
-			->with("UPDATE `articles` AS `Article` LEFT JOIN `users` AS `User` ON (`Article`.`user_id` = `User`.`id`)" .
+			->with("UPDATE `$db`.`articles` AS `Article` LEFT JOIN `$db`.`users` AS `User` ON " .
+				"(`Article`.`user_id` = `User`.`id`)" .
 				" SET `Article`.`field1` = 'value'  WHERE `index` = 'val'");
 
 		$Article = new Article();
@@ -3515,18 +3518,21 @@ public function testUpdateStatements() {
 	public function testDeleteStatements() {
 		$this->loadFixtures('Article', 'User');
 		$test = ConnectionManager::getDatasource('test');
+		$db = $test->config['database'];
 
 		$this->Dbo = $this->getMock('Mysql', array('execute'), array($test->config));
 
 		$this->Dbo->expects($this->at(0))->method('execute')
-			->with("DELETE  FROM `articles`  WHERE 1 = 1");
+			->with("DELETE  FROM `$db`.`articles`  WHERE 1 = 1");
 
 		$this->Dbo->expects($this->at(1))->method('execute')
-			->with("DELETE `Article` FROM `articles` AS `Article` LEFT JOIN `users` AS `User` ON (`Article`.`user_id` = `User`.`id`)" .
+			->with("DELETE `Article` FROM `$db`.`articles` AS `Article` LEFT JOIN `$db`.`users` AS `User` " . 
+				"ON (`Article`.`user_id` = `User`.`id`)" .
 				"  WHERE 1 = 1");
 
 		$this->Dbo->expects($this->at(2))->method('execute')
-			->with("DELETE `Article` FROM `articles` AS `Article` LEFT JOIN `users` AS `User` ON (`Article`.`user_id` = `User`.`id`)" .
+			->with("DELETE `Article` FROM `$db`.`articles` AS `Article` LEFT JOIN `$db`.`users` AS `User` " .
+				"ON (`Article`.`user_id` = `User`.`id`)" .
 				"  WHERE 2=2");
 		$Article = new Article();