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

Merge pull request #2523 from bar/2.5-dbosource

Browse source 
Update documentation and typehint.
This commit is contained in:
Mark Story 2013-12-21 18:30:44 -08:00
commit 4e55aa43f0
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1437,15 +1437,17 @@ class DboSource extends DataSource {
}
/**
* Merge the results of hasMany relations.
* Merge the results of 'hasMany' associations.
*
* Note: this function also deals with the formatting of the data.
*
* @param array $resultSet Data to merge into.
* @param array $merge Data to merge.
* @param array $assocResultSet Data to merge.
* @param string $association Name of Model being merged.
* @param Model $Model Model being merged onto.
* @return void
*/
protected function _mergeHasMany(&$resultSet, $merge, $association, $Model) {
protected function _mergeHasMany(&$resultSet, $assocResultSet, $association, Model $Model) {
$modelAlias = $Model->alias;
$primaryKey = $Model->primaryKey;
$foreignKey = $Model->hasMany[$association]['foreignKey'];
@ -1458,7 +1460,7 @@ class DboSource extends DataSource {
$resultPrimaryKey = $result[$modelAlias][$primaryKey];
$merged = array();
foreach ($merge as $data) {
foreach ($assocResultSet as $data) {
if ($resultPrimaryKey !== $data[$association][$foreignKey]) {
continue;
}
@ -1637,7 +1639,7 @@ class DboSource extends DataSource {
* @param boolean $external Whether or not the association query is on an external datasource.
* @return mixed
* String representing a query.
* True. when $external is false and association $type is 'hasOne' or 'belongsTo'.
* True, when $external is false and association $type is 'hasOne' or 'belongsTo'.
*/
public function generateAssociationQuery(Model $Model, Model $LinkModel, $type, $association, $assocData, &$queryData, $external) {
$assocData = $this->_scrubQueryData($assocData);