change the structure of find result array

yoichisatoyoshi · May 12, 2011 · e77674a · e77674a
1 parent 923a3bb
commit e77674a
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/models/datasources/mongodb_source.php b/models/datasources/mongodb_source.php
@@ -1049,21 +1049,26 @@ public function read(&$Model, $query = array(), $recursive = null) {
 									);
 							$hasManyResult = $linkModel->find('all', $params);
 
+
 							if(!empty($hasManyResult)) {
 								//aggregate retrieving data using array key(foreigin key _id)
 								$hasManyResultSet = array();
 								foreach($hasManyResult as $key => $val) {
-									$hasManyResultSet[ $val[$linkModel->alias][$assocData['foreignKey']] ][] = $val;
+									$foreignKey = $val[$linkModel->alias][$assocData['foreignKey']];
+									if(!empty($foreignKey)) {
+										$hasManyResultSet[$foreignKey][] = $val[$linkModel->alias];
+									}
 								}
 
 								//set relational retrieving data to return data
 								foreach($return as $key => $val) {
 									if(!empty($hasManyResultSet[ $val[$Model->alias][$Model->primaryKey] ])) {
-										$return[$key][$linkModel->alias] = $hasManyResultSet[ $val[$Model->alias][$Model->primaryKey] ];
+										$return[$key][$Model->alias][$linkModel->alias] = $hasManyResultSet[ $val[$Model->alias][$Model->primaryKey] ];
 									} else {
-										$return[$key][$linkModel->alias] = array();
+										$return[$key][$Model->alias][$linkModel->alias] = array();
 									}
 								}
+
 							}
 							break;
 
@@ -1123,6 +1128,7 @@ public function read(&$Model, $query = array(), $recursive = null) {
 								}
 							}
 							break;
+
 					}
 				}
 			}