Allow any contain call to overwrite the eagerloader.

The override parameter should always work when used. Refs #7412
cakephp · Sep 20, 2015 · b417193 · b417193
1 parent 06c7f1e
commit b417193
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/ORM/Query.php b/src/ORM/Query.php
@@ -287,7 +287,7 @@ public function eagerLoader(EagerLoader $instance = null)
      */
     public function contain($associations = null, $override = false)
     {
-        if (empty($associations) && $override) {
+        if ($override) {
             $this->_eagerLoader = null;
         }
 

diff --git a/tests/TestCase/ORM/QueryTest.php b/tests/TestCase/ORM/QueryTest.php
@@ -1822,6 +1822,28 @@ public function testCacheIntegrationWithFormatResults()
         $this->assertSame($expected, $results);
     }
 
+    /**
+     * Test overwriting the contained associations.
+     *
+     * @return void
+     */
+    public function testContainOverwrite()
+    {
+        $table = TableRegistry::get('Articles');
+        $table->hasMany('Comments');
+        $table->belongsTo('Authors');
+
+        $query = $table->find();
+        $query->contain(['Comments']);
+        $this->assertEquals(['Comments'], array_keys($query->contain()));
+
+        $query->contain(['Authors'], true);
+        $this->assertEquals(['Authors'], array_keys($query->contain()));
+
+        $query->contain(['Comments', 'Authors'], true);
+        $this->assertEquals(['Comments', 'Authors'], array_keys($query->contain()));
+    }
+
     /**
      * Integration test to show filtering associations using contain and a closure
      *