adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix failing tests.

Browse source 
Not everyone uses the same database names as me.
This commit is contained in:
mark_story 2014-03-24 10:04:19 -04:00
parent 2fe8c4050b
commit ff73229ab8
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
View file

@ -1288,9 +1288,12 @@ class MysqlTest extends CakeTestCase {
->method('getDataSource')
->will($this->returnValue($test));
$search = "LEFT JOIN `cake_test_db`.`test_model8` AS `TestModel8` ON " .
$model8Table = $test->fullTableName($this->Model->TestModel8);
$usersTable = $test->fullTableName('users');
$search = "LEFT JOIN $model8Table AS `TestModel8` ON " .
"(`TestModel8`.`name` != 'larry' AND `TestModel9`.`test_model8_id` = `TestModel8`.`id`) " .
"LEFT JOIN `cake_test_db`.`users` AS `User` ON (`TestModel9`.`id` = `User`.`test_id`)";
"LEFT JOIN $usersTable AS `User` ON (`TestModel9`.`id` = `User`.`test_id`)";
$test->expects($this->at(0))->method('execute')
->with($this->stringContains($search));