Making test more clear and re-adding missing junction conditions in s…

…ubquery for `notMatching`
cakephp · Jun 26, 2016 · 288781c · 288781c
1 parent 344317d
commit 288781c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/ORM/Association/BelongsToMany.php b/src/ORM/Association/BelongsToMany.php
@@ -378,7 +378,8 @@ protected function _appendNotMatching($query, $options)
 
         $subquery = $this->find()
             ->select(array_values($conds))
-            ->where($options['conditions']);
+            ->where($options['conditions'])
+            ->andWhere($this->junctionConditions());
 
         $subquery = $options['queryBuilder']($subquery);
 

diff --git a/tests/TestCase/ORM/QueryTest.php b/tests/TestCase/ORM/QueryTest.php
@@ -2995,7 +2995,8 @@ public function testLeftJoinWithNested()
             ->find()
             ->select([
                 'authors.id',
-                'total_articles' => 'count(tags.id)'])
+                'tagged_articles' => 'count(tags.id)'
+            ])
             ->leftJoinWith('articles.tags', function ($q) {
                 return $q->where(['tags.name' => 'tag3']);
             })
@@ -3007,7 +3008,7 @@ public function testLeftJoinWithNested()
             3 => 1,
             4 => 0
         ];
-        $this->assertEquals($expected, $results->combine('id', 'total_articles')->toArray());
+        $this->assertEquals($expected, $results->combine('id', 'tagged_articles')->toArray());
     }
 
     /**