Initial implementation of Query::notMatching()

cakephp · Jun 6, 2015 · 2d35e45 · 2d35e45
1 parent bd0f737
commit 2d35e45
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 2 deletions.
diff --git a/src/ORM/Association.php b/src/ORM/Association.php
@@ -499,6 +499,14 @@ public function attachTo(Query $query, array $options = [])
             }
         }
 
+        if ($options['negateMatch']) {
+            $primaryKey = $query->aliasFields((array)$target->primaryKey(), $this->_name);
+            $query->andWhere(function ($exp) use ($primaryKey) {
+                array_map([$exp, 'isNull'], $primaryKey);
+                return $exp;
+            });
+        }
+
         list($finder, $opts) = $this->_extractFinder($options['finder']);
         $dummy = $this
             ->find($finder, $opts)
@@ -518,7 +526,7 @@ public function attachTo(Query $query, array $options = [])
 
         $joinOptions = ['table' => 1, 'conditions' => 1, 'type' => 1];
         $options['conditions'] = $dummy->clause('where');
-        $query->join([$target->alias() => array_intersect_key($options, $joinOptions)]);
+        $query->join([$this->_name => array_intersect_key($options, $joinOptions)]);
 
         $this->_appendFields($query, $dummy, $options);
         $this->_formatAssociationResults($query, $dummy, $options);

diff --git a/src/ORM/EagerLoader.php b/src/ORM/EagerLoader.php
@@ -64,7 +64,8 @@ class EagerLoader
         'queryBuilder' => 1,
         'finder' => 1,
         'joinType' => 1,
-        'strategy' => 1
+        'strategy' => 1,
+        'negateMatch' => 1
     ];
 
     /**

diff --git a/src/ORM/Query.php b/src/ORM/Query.php
@@ -455,6 +455,17 @@ public function innerJoinWith($assoc, callable $builder = null)
         return $this;
     }
 
+    public function notMatching($assoc, callable $builder = null)
+    {
+        $this->eagerLoader()->matching($assoc, $builder, [
+            'joinType' => 'LEFT',
+            'fields' => false,
+            'negateMatch' => true
+        ]);
+        $this->_dirty();
+        return $this;
+    }
+
     /**
      * Returns a key => value array representing a single aliased field
      * that can be passed directly to the select() method.

diff --git a/tests/TestCase/ORM/QueryTest.php b/tests/TestCase/ORM/QueryTest.php
@@ -2844,4 +2844,34 @@ public function testInnerJoinWithSelect()
             ->toArray();
         $this->assertEquals($expected, $results);
     }
+
+    public function testNotMatching()
+    {
+        $table = TableRegistry::get('authors');
+        $articles = $table->hasMany('articles');
+
+        $results = $table->find()
+            ->hydrate(false)
+            ->notMatching('articles')
+            ->toArray();
+
+        $expected = [
+            ['id' => 2, 'name' => 'nate'],
+            ['id' => 4, 'name' => 'garrett'],
+        ];
+        $this->assertEquals($expected, $results);
+
+        $results = $table->find()
+            ->hydrate(false)
+            ->notMatching('articles', function ($q) {
+                return $q->where(['articles.author_id' => 1]);
+            })
+            ->toArray();
+        $expected = [
+            ['id' => 2, 'name' => 'nate'],
+            ['id' => 3, 'name' => 'larry'],
+            ['id' => 4, 'name' => 'garrett'],
+        ];
+        $this->assertEquals($expected, $results);
+    }
 }