Adding joinData to the target relation array wehn using matching

The scenario that c41f40c was wondering about came to be sooner than expected.
cakephp · Mar 27, 2014 · 9c2c00e · 9c2c00e
1 parent 6ef9579
commit 9c2c00e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/ORM/Association/BelongsToMany.php b/src/ORM/Association/BelongsToMany.php
@@ -249,9 +249,13 @@ public function attachTo(Query $query, array $options = []) {
  * @param array $row
  * @return array
  */
-	public function transformRow($row) {
+	public function transformRow($row, $joined = false) {
+		$alias = $this->junction()->alias();
+		if ($joined) {
+			$row[$this->target()->alias()]['_joinData'] = $row[$alias];
+			unset($row[$alias]);
+		}
 		$row = $this->_transformRow($row);
-		unset($row[$this->junction()->alias()]);
 		return $row;
 	}
 

diff --git a/src/ORM/ResultSet.php b/src/ORM/ResultSet.php
@@ -404,7 +404,7 @@ protected function _groupResult($row) {
 				$results[$alias] = $entity;
 			}
 
-			$results = $instance->transformRow($results);
+			$results = $instance->transformRow($results, $assoc['canBeJoined']);
 		}
 
 		foreach ($presentAliases as $alias => $present) {

diff --git a/tests/TestCase/ORM/QueryTest.php b/tests/TestCase/ORM/QueryTest.php
@@ -659,7 +659,8 @@ public function testFilteringByBelongsToManyNoHydration() {
 				'published' => 'Y',
 				'tags' => [
 					'id' => 3,
-					'name' => 'tag3'
+					'name' => 'tag3',
+					'_joinData' => ['article_id' => 2, 'tag_id' => 3]
 				]
 			]
 		];
@@ -681,7 +682,8 @@ public function testFilteringByBelongsToManyNoHydration() {
 				'published' => 'Y',
 				'tags' => [
 					'id' => 2,
-					'name' => 'tag2'
+					'name' => 'tag2',
+					'_joinData' => ['article_id' => 1, 'tag_id' => 2]
 				]
 			]
 		];
@@ -719,7 +721,8 @@ public function testMatchingDotNotation() {
 					'published' => 'Y',
 					'tags' => [
 						'id' => 2,
-						'name' => 'tag2'
+						'name' => 'tag2',
+						'_joinData' => ['article_id' => 1, 'tag_id' => 2]
 					]
 				]
 			]
@@ -1873,7 +1876,6 @@ public function testRepeatedAssociationAliases() {
 		$table->belongsTo('Tags');
 		TableRegistry::get('Tags')->belongsToMany('Articles');
 		$results = $table->find()->contain(['Articles', 'Tags.Articles'])->hydrate(false)->toArray();
-		debug($results);
 	}
 
 }