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

Get Model associations only when needed.

Browse source
This commit is contained in:
Ber Clausen 2013-12-21 03:14:27 -03:00
parent 8355d32bb1
commit 60a8f0900b
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1042,7 +1042,7 @@ class DboSource extends DataSource {
} }
if ($recursive !== null) { if ($recursive !== null) {
$_recursive = $Model->recursive; $modelRecursive = $Model->recursive;
$Model->recursive = $recursive; $Model->recursive = $recursive;
} }
@ -1054,17 +1054,22 @@ class DboSource extends DataSource {
$queryData['fields'] = $this->fields($Model); $queryData['fields'] = $this->fields($Model);
} }
$_associations = $Model->associations(); if ($Model->recursive === -1) {
// Primary model data only, no joins.
$associations = array();
if ($Model->recursive == -1) { } else {
$_associations = array(); $associations = $Model->associations();
} elseif ($Model->recursive === 0) {
unset($_associations[2], $_associations[3]); if ($Model->recursive === 0) {
// Primary model data and its domain.
unset($associations[2], $associations[3]);
}
} }
// Generate hasOne and belongsTo associations inside $queryData // Generate hasOne and belongsTo associations inside $queryData
$linkedModels = array(); $linkedModels = array();
foreach ($_associations as $type) { foreach ($associations as $type) {
if ($type !== 'hasOne' && $type !== 'belongsTo') { if ($type !== 'hasOne' && $type !== 'belongsTo') {
continue; continue;
} }
@ -1113,7 +1118,7 @@ class DboSource extends DataSource {
$joined[$Model->alias] = (array)Hash::extract($queryData['joins'], '{n}.alias'); $joined[$Model->alias] = (array)Hash::extract($queryData['joins'], '{n}.alias');
} }
foreach ($_associations as $type) { foreach ($associations as $type) {
foreach ($Model->{$type} as $assoc => $assocData) { foreach ($Model->{$type} as $assoc => $assocData) {
$LinkModel = $Model->{$assoc}; $LinkModel = $Model->{$assoc};
@ -1142,7 +1147,7 @@ class DboSource extends DataSource {
} }
if ($recursive !== null) { if ($recursive !== null) {
$Model->recursive = $_recursive; $Model->recursive = $modelRecursive;
} }
return $resultSet; return $resultSet;