mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 11:28:25 +00:00
Fixing unnecessary extra calls to 'afterFind' callback of 'hasMany' associated models. Closes #995
This commit is contained in:
parent
82fffe6914
commit
bfaaa6b8ba
1 changed files with 6 additions and 2 deletions
|
@ -54,7 +54,7 @@ class DboSource extends DataSource {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Caches result from query parsing operations. Cached results for both DboSource::name() and
|
* Caches result from query parsing operations. Cached results for both DboSource::name() and
|
||||||
* DboSource::conditions() will be stored here. Method caching uses `crc32()` which is
|
* DboSource::conditions() will be stored here. Method caching uses `crc32()` which is
|
||||||
* fast but can collisions more easily than other hashing algorithms. If you have problems
|
* fast but can collisions more easily than other hashing algorithms. If you have problems
|
||||||
* with collisions, set DboSource::$cacheMethods to false.
|
* with collisions, set DboSource::$cacheMethods to false.
|
||||||
*
|
*
|
||||||
|
@ -519,7 +519,7 @@ class DboSource extends DataSource {
|
||||||
* because the method uses a simple hashing algorithm it can infrequently have collisions.
|
* because the method uses a simple hashing algorithm it can infrequently have collisions.
|
||||||
* Setting DboSource::$cacheMethods to false will disable the memory cache.
|
* Setting DboSource::$cacheMethods to false will disable the memory cache.
|
||||||
*
|
*
|
||||||
* @param mixed $data Either a string with a column to quote. An array of columns to quote or an
|
* @param mixed $data Either a string with a column to quote. An array of columns to quote or an
|
||||||
* object from DboSource::expression() or DboSource::identifier()
|
* object from DboSource::expression() or DboSource::identifier()
|
||||||
* @return string SQL field
|
* @return string SQL field
|
||||||
* @access public
|
* @access public
|
||||||
|
@ -845,6 +845,10 @@ class DboSource extends DataSource {
|
||||||
$stack = array($assoc);
|
$stack = array($assoc);
|
||||||
$db->queryAssociation($model, $linkModel, $type, $assoc, $assocData, $array, true, $resultSet, $model->recursive - 1, $stack);
|
$db->queryAssociation($model, $linkModel, $type, $assoc, $assocData, $array, true, $resultSet, $model->recursive - 1, $stack);
|
||||||
unset($db);
|
unset($db);
|
||||||
|
|
||||||
|
if ($type === 'hasMany') {
|
||||||
|
$filtered []= $assoc;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue