Allow formatting join tables

cakephp · Oct 29, 2016 · 341fb32 · 341fb32
1 parent 02f5af9
commit 341fb32
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/ORM/Association/BelongsToMany.php b/src/ORM/Association/BelongsToMany.php
@@ -1285,7 +1285,11 @@ protected function _buildQuery($options)
         $query
             ->eagerLoader()
             ->addToJoinsMap($tempName, $assoc, false, $this->_junctionProperty);
-        $assoc->attachTo($query, ['aliasPath' => $assoc->alias(), 'includeFields' => false]);
+        $assoc->attachTo($query, [
+            'aliasPath' => $assoc->alias(),
+            'includeFields' => false,
+            'propertyPath' => $this->_junctionProperty
+        ]);
 
         return $query;
     }

diff --git a/tests/TestCase/ORM/QueryTest.php b/tests/TestCase/ORM/QueryTest.php
@@ -1312,7 +1312,10 @@ public function testFormatResultsBelongsToMany()
             ->eventManager()
             ->attach(function ($event, $query) {
                 $query->formatResults(function ($results) {
-                    $results->beforeFind = true;
+                    foreach ($results as $result) {
+                        $result->beforeFind = true;
+                    }
+
                     return $results;
                 });
             }, 'Model.beforeFind');
@@ -1333,21 +1336,27 @@ public function testFormatResultsBelongsToMany()
         $expected = [
             'id' => 1,
             'name' => 'tag1',
-            '_joinData' => ['article_id' => 1, 'tag_id' => 1],
+            '_joinData' => [
+                'article_id' => 1,
+                'tag_id' => 1,
+                'beforeFind' => true,
+            ],
             'description' => 'A big description',
             'created' => new Time('2016-01-01 00:00'),
-            'beforeFind' => true,
         ];
         $this->assertEquals($expected, $first->tags[0]->toArray());
         $this->assertInstanceOf(Time::class, $first->tags[0]->created);
 
         $expected = [
             'id' => 2,
             'name' => 'tag2',
-            '_joinData' => ['article_id' => 1, 'tag_id' => 2],
+            '_joinData' => [
+                'article_id' => 1,
+                'tag_id' => 2,
+                'beforeFind' => true,
+            ],
             'description' => 'Another big description',
             'created' => new Time('2016-01-01 00:00'),
-            'beforeFind' => true,
         ];
         $this->assertEquals($expected, $first->tags[1]->toArray());
         $this->assertInstanceOf(Time::class, $first->tags[0]->created);