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

Call getDataSource() instead of the directly calling

Browse source 
ConnectionManager::getDataSource().
This commit is contained in:
Ber Clausen 2013-11-12 01:47:14 -03:00
parent c1f3d9c274
commit 52d425737a
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1117,11 +1117,7 @@ class DboSource extends DataSource {
$LinkModel = $Model->{$assoc};
if (!isset($linkedModels[$type . '/' . $assoc])) {
if ($Model->useDbConfig === $LinkModel->useDbConfig) {
$db = $this;
} else {
$db = ConnectionManager::getDataSource($LinkModel->useDbConfig);
}
$db = $Model->useDbConfig === $LinkModel->useDbConfig ? $this : $LinkModel->getDataSource();
} elseif ($Model->recursive > 1) {
$db = $this;
}
@ -1129,8 +1125,8 @@ class DboSource extends DataSource {
if (isset($db) && method_exists($db, 'queryAssociation')) {
$stack = array($assoc);
$stack['_joined'] = $joined;
$db->queryAssociation($Model, $LinkModel, $type, $assoc, $assocData, $array, true, $resultSet, $Model->recursive - 1, $stack);
unset($db);
if ($type === 'hasMany' || $type === 'hasAndBelongsToMany') {
$filtered[] = $assoc;
@ -1246,11 +1242,7 @@ class DboSource extends DataSource {
$tmpStack = $stack;
$tmpStack[] = $assoc1;
if ($LinkModel->useDbConfig === $DeepModel->useDbConfig) {
$db = $this;
} else {
$db = ConnectionManager::getDataSource($DeepModel->useDbConfig);
}
$db = $LinkModel->useDbConfig === $DeepModel->useDbConfig ? $this : $DeepModel->getDataSource();
$db->queryAssociation($LinkModel, $DeepModel, $type1, $assoc1, $assocData1, $queryData, true, $fetch, $recursive - 1, $tmpStack);
}
@ -1331,11 +1323,9 @@ class DboSource extends DataSource {
if ($type1 === 'belongsTo' || ($DeepModel->alias === $modelAlias && $type === 'belongsTo') || ($DeepModel->alias !== $modelAlias)) {
$tmpStack = $stack;
$tmpStack[] = $assoc1;
if ($LinkModel->useDbConfig == $DeepModel->useDbConfig) {
$db = $this;
} else {
$db = ConnectionManager::getDataSource($DeepModel->useDbConfig);
}
$db = $LinkModel->useDbConfig === $DeepModel->useDbConfig ? $this : $DeepModel->getDataSource();
$db->queryAssociation($LinkModel, $DeepModel, $type1, $assoc1, $assocData1, $queryData, true, $fetch, $recursive - 1, $tmpStack);
}
}