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

Fixing counterCache behavior when updating an existing record's counterScope value. Thanks for the patch, mattcurry. Fixes #6270.

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8155 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
jperras 2009-04-25 01:17:21 +00:00
parent 9ab6339392
commit 8bb11e49d7
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1374,16 +1374,15 @@ class Model extends Overloadable {
$conditions = ($recursive == 1) ? (array)$assoc['counterScope'] : array(); $conditions = ($recursive == 1) ? (array)$assoc['counterScope'] : array();
if (isset($keys['old'][$foreignKey])) { if (isset($keys['old'][$foreignKey])) {
if ($keys['old'][$foreignKey] == $keys[$foreignKey]) { if ($keys['old'][$foreignKey] != $keys[$foreignKey]) {
continue; $conditions[$fkQuoted] = $keys['old'][$foreignKey];
} $count = intval($this->find('count', compact('conditions', 'recursive')));
$conditions[$fkQuoted] = $keys['old'][$foreignKey];
$count = intval($this->find('count', compact('conditions', 'recursive')));
$this->{$parent}->updateAll( $this->{$parent}->updateAll(
array($assoc['counterCache'] => $count), array($assoc['counterCache'] => $count),
array($this->{$parent}->escapeField() => $keys['old'][$foreignKey]) array($this->{$parent}->escapeField() => $keys['old'][$foreignKey])
); );
}
} }
$conditions[$fkQuoted] = $keys[$foreignKey]; $conditions[$fkQuoted] = $keys[$foreignKey];

4
cake/tests/cases/libs/model/model.test.php
View file

@ -3990,6 +3990,10 @@ class ModelTest extends CakeTestCase {
$TestModel2->saveField('published', true); $TestModel2->saveField('published', true);
$result = $TestModel->findById(1); $result = $TestModel->findById(1);
$this->assertIdentical($result['Syfile']['item_count'], '2'); $this->assertIdentical($result['Syfile']['item_count'], '2');
$TestModel2->save(array('id' => 1, 'syfile_id' => 1, 'published'=> false));
$result = $TestModel->findById(1);
$this->assertIdentical($result['Syfile']['item_count'], '1');
} }
/** /**
* testDel method * testDel method