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

Merge pull request #9454 from cakephp/revert-9368-2.x-test-fixtures

Browse source 
Revert "CakeFixtureManager: Truncate tables only if not dropped."
This commit is contained in:
Mark Story 2016-09-17 12:25:24 -04:00 committed by GitHub
commit 63533d8f2d
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
View file

@ -218,7 +218,7 @@ class CakeFixtureManager {
if (empty($test->fixtures)) {
return;
}
$fixtures = array_unique($test->fixtures);
$fixtures = $test->fixtures;
if (empty($fixtures) || !$test->autoFixtures) {
return;
}
@ -229,9 +229,7 @@ class CakeFixtureManager {
$db = ConnectionManager::getDataSource($fixture->useDbConfig);
$db->begin();
$this->_setupTable($fixture, $db, $test->dropTables);
if (!$test->dropTables) {
$fixture->truncate($db);
}
$fixture->truncate($db);
$fixture->insert($db);
$db->commit();
}
@ -276,9 +274,7 @@ class CakeFixtureManager {
$db = ConnectionManager::getDataSource($fixture->useDbConfig);
}
$this->_setupTable($fixture, $db, $dropTables);
if (!$dropTables) {
$fixture->truncate($db);
}
$fixture->truncate($db);
$fixture->insert($db);
} else {
throw new UnexpectedValueException(__d('cake_dev', 'Referenced fixture class %s not found', $name));