Merge pull request #273 from csarrazi/doctrine/eager-fetch-mode

Added support for eager-loading associations in collections

Author: dunglas

Doctrine/Orm/DataProvider.php

@@ -12,6 +12,7 @@
 namespace Dunglas\ApiBundle\Doctrine\Orm;
 
 use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\ORM\Tools\Pagination\Paginator as DoctrineOrmPaginator;
 use Doctrine\ORM\QueryBuilder;
 use Dunglas\ApiBundle\Doctrine\Orm\Filter\FilterInterface;
@@ -122,6 +123,15 @@ public function getCollection(ResourceInterface $resource, Request $request)
         $classMetaData = $manager->getClassMetadata($entityClass);
         $identifiers = $classMetaData->getIdentifier();
 
+        foreach ($classMetaData->getAssociationNames() as $i => $association) {
+            $mapping = $classMetaData->associationMappings[$association];
+
+            if (ClassMetadataInfo::FETCH_EAGER === $mapping['fetch']) {
+                $queryBuilder->join('o.'.$association, 'a'.$i);
+                $queryBuilder->addSelect('a'.$i);
+            }
+        }
+
         if (null !== $this->order && 1 === count($identifiers)) {
             $identifier = $identifiers[0];
             $queryBuilder->addOrderBy('o.'.$identifier, $this->order);