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

Fixed issue where Model::saveAll() would incorrectly commit a transaction which was not started in that function call itself.

Browse source
This commit is contained in:
ADmad 2010-11-03 18:55:42 +05:30
parent 268dae722e
commit eb76ab95f2
3 changed files with 44 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1589,7 +1589,7 @@ class Model extends Overloadable {
}
if ($options['atomic'] && $options['validate'] !== 'only') {
$db->begin($this);
$transactionBegun = $db->begin($this);
}
if (Set::numeric(array_keys($data))) {
@ -1629,9 +1629,13 @@ class Model extends Overloadable {
break;
default:
if ($options['atomic']) {
if ($validates && ($db->commit($this) !== false)) {
if ($validates) {
if ($transactionBegun) {
return $db->commit($this) !== false;
} else {
return true;
}
}
$db->rollback($this);
return false;
}
@ -1740,7 +1744,11 @@ class Model extends Overloadable {
default:
if ($options['atomic']) {
if ($validates) {
return ($db->commit($this) !== false);
if ($transactionBegun) {
return $db->commit($this) !== false;
} else {
return true;
}
} else {
$db->rollback($this);
}

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

@ -3121,6 +3121,22 @@ class ModelWriteTest extends BaseModelTest {
$Post->saveAll($data);
}
/**
* test saveAll with nested saveAll call.
*
* @return void
*/
function testSaveAllNestedSaveAll() {
$this->loadFixtures('Sample');
$TransactionTestModel =& new TransactionTestModel();
$data = array(
array('apple_id' => 1, 'name' => 'sample5'),
);
$this->assertTrue($TransactionTestModel->saveAll($data, array('atomic' => true)));
}
/**
* testSaveAllTransaction method
*

15
cake/tests/cases/libs/model/models.php
View file

@ -3557,6 +3557,7 @@ class FruitNoWith extends CakeTestModel {
)
);
}
class UuidTagNoWith extends CakeTestModel {
var $name = 'UuidTag';
var $useTable = 'uuid_tags';
@ -3573,11 +3574,21 @@ class UuidTagNoWith extends CakeTestModel {
class ProductUpdateAll extends CakeTestModel {
var $name = 'ProductUpdateAll';
var $useTable = 'product_update_all';
}
class GroupUpdateAll extends CakeTestModel {
var $name = 'GroupUpdateAll';
var $useTable = 'group_update_all';
}
class TransactionTestModel extends CakeTestModel {
var $name = 'TransactionTestModel';
var $useTable = 'samples';
function afterSave($created) {
$data = array(
array('apple_id' => 1, 'name' => 'sample6'),
);
$this->saveAll($data, array('atomic' => true, 'callbacks' => false));
}
}