adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 11:06:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-expose DboSource::fetchAssociated() for BC.

Browse source 
Internally use protected methods to fetch hasMany and hasAndBelongsToMany
associations.
This commit is contained in:
Ber Clausen 2013-12-21 11:34:40 -03:00
parent 5ccb77e25d
commit c15f7de164
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/Cake/Model/Datasource/DboSource.php
View file

@ -1248,7 +1248,7 @@ class DboSource extends DataSource {
// Fetch // Fetch
$assocResultSet = array(); $assocResultSet = array();
if (!empty($assocIds)) { if (!empty($assocIds)) {
$assocResultSet = $this->fetchHasMany($Model, $queryTemplate, $assocIds); $assocResultSet = $this->_fetchHasMany($Model, $queryTemplate, $assocIds);
} }
// Recursively query associations // Recursively query associations
@ -1286,7 +1286,7 @@ class DboSource extends DataSource {
// Fetch // Fetch
$assocResultSet = array(); $assocResultSet = array();
if (!empty($assocIds)) { if (!empty($assocIds)) {
$assocResultSet = $this->fetchHasAndBelongsToMany($Model, $queryTemplate, $assocIds, $association); $assocResultSet = $this->_fetchHasAndBelongsToMany($Model, $queryTemplate, $assocIds, $association);
} }
$habtmAssocData = $Model->hasAndBelongsToMany[$association]; $habtmAssocData = $Model->hasAndBelongsToMany[$association];
@ -1379,6 +1379,21 @@ class DboSource extends DataSource {
} }
} }
/**
* Fetch 'hasMany' associations.
*
* This is just a proxy to maintain BC.
*
* @param Model $Model Primary model object.
* @param string $query Association query template.
* @param array $ids Array of IDs of associated records.
* @return array Association results.
* @see DboSource::_fetchHasMany()
*/
public function fetchAssociated(Model $Model, $query, $ids) {
return $this->_fetchHasMany($Model, $query, $ids);
}
/** /**
* Fetch 'hasMany' associations. * Fetch 'hasMany' associations.
* *
@ -1387,7 +1402,7 @@ class DboSource extends DataSource {
* @param array $ids Array of IDs of associated records. * @param array $ids Array of IDs of associated records.
* @return array Association results. * @return array Association results.
*/ */
public function fetchHasMany(Model $Model, $query, $ids) { protected function _fetchHasMany(Model $Model, $query, $ids) {
$ids = array_unique($ids); $ids = array_unique($ids);
$query = str_replace('{$__cakeID__$}', implode(', ', $ids), $query); $query = str_replace('{$__cakeID__$}', implode(', ', $ids), $query);
@ -1407,7 +1422,7 @@ class DboSource extends DataSource {
* @param string $association Association name. * @param string $association Association name.
* @return array Association results. * @return array Association results.
*/ */
public function fetchHasAndBelongsToMany(Model $Model, $query, $ids, $association) { protected function _fetchHasAndBelongsToMany(Model $Model, $query, $ids, $association) {
$ids = array_unique($ids); $ids = array_unique($ids);
if (count($ids) > 1) { if (count($ids) > 1) {