Fixing lazy loading of database conenction when using prefixes and pe…

…rforming delete operations
cakephp · Feb 23, 2011 · 8f62d01 · 8f62d01
1 parent fc060b5
commit 8f62d01
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
@@ -1852,7 +1852,7 @@ protected function _getJoins($model) {
 		$joins = array_merge($model->getAssociated('hasOne'), $model->getAssociated('belongsTo'));
 
 		foreach ($joins as $assoc) {
-			if (isset($model->{$assoc}) && $model->useDbConfig == $model->{$assoc}->useDbConfig) {
+			if (isset($model->{$assoc}) && $model->useDbConfig == $model->{$assoc}->useDbConfig && $model->{$assoc}->getDataSource()) {
 				$assocData = $model->getAssociated($assoc);
 				$join[] = $this->buildJoinStatement(array(
 					'table' => $this->fullTableName($model->{$assoc}),

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
@@ -1882,7 +1882,7 @@ function delete($id = null, $cascade = true) {
 			if (!$filters || !$this->exists()) {
 				return false;
 			}
-			$db = ConnectionManager::getDataSource($this->useDbConfig);
+			$db = $this->getDataSource();
 
 			$this->_deleteDependent($id, $cascade);
 			$this->_deleteLinks($id);