From bbfe3170dca7a6b8b53fa4d1b4108e901d89e834 Mon Sep 17 00:00:00 2001 From: mark_story Date: Mon, 1 Dec 2014 23:03:47 -0500 Subject: [PATCH] Fix incorrect hardcoded database name. --- lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php index f8188c4d8..5503b7d40 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php @@ -3447,9 +3447,10 @@ SQL; $test->getLog(); $result = $Article->find('all', compact('conditions', 'contain')); - $expected = 'SELECT `Comment`.`id`, `Comment`.`article_id`, `Comment`.`user_id`, `Comment`.`comment`, `Comment`.`published`, `Comment`.`created`,' . + $expected = 'SELECT `Comment`.`id`, `Comment`.`article_id`, `Comment`.`user_id`, `Comment`.`comment`,' . + ' `Comment`.`published`, `Comment`.`created`,' . ' `Comment`.`updated`, (SELECT id FROM comments WHERE id = (SELECT 1)) AS `Comment__extra`' . - ' FROM `cakephp_test`.`comments` AS `Comment` WHERE `Comment`.`article_id` IN (1, 2)'; + ' FROM ' . $test->fullTableName('comments') . ' AS `Comment` WHERE `Comment`.`article_id` IN (1, 2)'; $log = $test->getLog(); $this->assertTextEquals($expected, $log['log'][count($log['log']) - 2]['query']);