Optimized column fetching in loadInto()

cakephp · Jun 28, 2015 · 04c811b · 04c811b
1 parent ed67eaf
commit 04c811b
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/ORM/LazyEagerLoader.php b/src/ORM/LazyEagerLoader.php
@@ -49,8 +49,9 @@ protected function _getQuery($objects, $contain, $source)
             return $entity->{$method}($primaryKey);
         });
 
-        return $source
+        $query = $source
             ->find()
+            ->select((array)$primaryKey)
             ->where(function ($exp) use ($primaryKey, $keys, $source) {
                 if (is_array($primaryKey) && count($primaryKey) === 1) {
                     $primaryKey = current($primaryKey);
@@ -64,6 +65,14 @@ protected function _getQuery($objects, $contain, $source)
                 return new TupleComparison($primaryKey, $keys->toList());
             })
             ->contain($contain);
+
+        foreach ($query->eagerLoader()->attachableAssociations($source) as $loadable) {
+            $config = $loadable->config();
+            $config['includeFields'] = true;
+            $loadable->config($config);
+        }
+
+        return $query;
     }
 
     protected function _getPropertyMap($source, $associations)