Merge pull request #11666 from cakephp/issue-11663

Fix invalid SQL generation from leftJoinWith() & auto-fields
cakephp · Jan 28, 2018 · 6e1db35 · 6e1db35
2 parents c0231dc + 0f8dd73
commit 6e1db35
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/ORM/Association.php b/src/ORM/Association.php
@@ -1143,7 +1143,8 @@ protected function _appendFields($query, $surrogate, $options)
         }
 
         if ($autoFields === true) {
-            $fields = array_merge((array)$fields, $target->getSchema()->columns());
+            $fields = array_filter((array)$fields);
+            $fields = array_merge($fields, $target->getSchema()->columns());
         }
 
         if ($fields) {

diff --git a/tests/TestCase/ORM/QueryTest.php b/tests/TestCase/ORM/QueryTest.php
@@ -3317,6 +3317,25 @@ public function testLeftJoinWithSelect()
         );
     }
 
+    /**
+     * Tests that leftJoinWith() can be used with autofields()
+     *
+     * @return void
+     */
+    public function testLeftJoinWithAutoFields()
+    {
+        $table = TableRegistry::get('articles');
+        $table->belongsTo('authors');
+
+        $results = $table
+            ->find()
+            ->leftJoinWith('authors', function ($q) {
+                return $q->enableAutoFields(true);
+            })
+            ->all();
+        $this->assertCount(3, $results);
+    }
+
     /**
      * Tests innerJoinWith()
      *