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

Removing continue statement that did nothing.

Browse source 
Adding a rollback for when validation fails and atomic has been set.
Tests added. Fixes #797
This commit is contained in:
mark_story 2010-06-09 13:48:54 -04:00
parent bca3c4ab38
commit ad8b70cec2
2 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cake/libs/model/model.php
View file

@ -1622,7 +1622,6 @@ class Model extends Overloadable {
case ($options['validate'] === 'first'):
$options['validate'] = true;
$return = array();
continue;
break;
default:
if ($options['atomic']) {
@ -1636,6 +1635,10 @@ class Model extends Overloadable {
break;
}
}
if ($options['atomic'] && !$validates) {
$db->rollback($this);
return false;
}
return $return;
}
$associations = $this->getAssociated();

28
cake/tests/cases/libs/model/model_write.test.php
View file

@ -3034,6 +3034,34 @@ class ModelWriteTest extends BaseModelTest {
), array('validate' => 'only'));
}
/**
* test saveAll with transactions and ensure there is no missing rollback.
*
* @return void
*/
function testSaveAllTransactionNoRollback() {
$this->loadFixtures('Post');
Mock::generate('DboSource', 'MockTransactionDboSource');
$db = ConnectionManager::create('mock_transaction', array(
'datasource' => 'MockTransactionDbo',
));
$db->expectOnce('rollback');
$Post =& new Post();
$Post->useDbConfig = 'mock_transaction';
$Post->validate = array(
'title' => array('rule' => array('notEmpty'))
);
$data = array(
array('author_id' => 1, 'title' => 'New Fourth Post'),
array('author_id' => 1, 'title' => '')
);
$Post->saveAll($data, array('atomic' => true));
}
/**
* testSaveAllTransaction method
*