fixing up auto joins

infinitas · Oct 7, 2012 · 8b3e841 · 8b3e841
1 parent 6d8b0a4
commit 8b3e841
Showing 1 changed file with 20 additions and 3 deletions.
diff --git a/Model/AppModel.php b/Model/AppModel.php
@@ -347,10 +347,27 @@ protected function _joinConditions($Model, &$options) {
 				$FromModel = $this->_getModelObject($options['from']);
 			}
 
+			$alias = $Model->alias;
+			if(!empty($options['alias'])) {
+				$alias = $options['alias'];
+			}
+
 			$relationType = $this->_relationType($Model, $FromModel);
 			switch($relationType) {
 				case 'hasOne':
-					throw new InvalidArgumentException('Not implemented');
+					if(empty($FromModel->{$relationType}[$Model->alias]['foreignKey'])) {
+						if(empty($FromModel->{$relationType}[$Model->alias]['conditions'])) {
+							throw new InvalidArgumentException('Unable to determin relation');
+						}
+
+						return $options['conditions'] = $FromModel->{$relationType}[$Model->alias]['conditions'];
+					}
+
+					if(!empty($FromModel->{$relationType}[$Model->alias]['conditions'])) {
+						$options['conditions'] = $FromModel->{$relationType}[$Model->alias]['conditions'];
+					}
+					$options['conditions'][] = $options['alias'] . '.' . $FromModel->{$relationType}[$Model->alias]['foreignKey'] . ' = ' . $FromModel->alias . '.' . $FromModel->primaryKey;
+					return;
 					break;
 
 				case 'hasMany':
@@ -365,11 +382,11 @@ protected function _joinConditions($Model, &$options) {
 
 					if($relationType == 'belongsTo') {
 						return $options['conditions'] = array(
-							$Model->alias . '.' . $FromModel->primaryKey . ' = ' . $FromModel->alias . '.' . $FromModel->{$relationType}[$Model->alias]['foreignKey']
+							$options['alias'] . '.' . $FromModel->primaryKey . ' = ' . $FromModel->alias . '.' . $FromModel->{$relationType}[$Model->alias]['foreignKey']
 						);
 					} elseif($relationType == 'hasMany') {
 						return $options['conditions'] = array(
-							$Model->alias . '.' . $FromModel->{$relationType}[$Model->alias]['foreignKey'] . ' = ' . $FromModel->alias . '.' . $FromModel->primaryKey
+							$options['alias'] . '.' . $FromModel->{$relationType}[$Model->alias]['foreignKey'] . ' = ' . $FromModel->alias . '.' . $FromModel->primaryKey
 						);
 					}
 					break;