Fix LargeCollection to work with recent association changes

comfortablynumb · Aug 10, 2010 · a1657f0 · a1657f0
1 parent 0582290
commit a1657f0
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/lib/DoctrineExtensions/LargeCollections/LargeCollection.php b/lib/DoctrineExtensions/LargeCollections/LargeCollection.php
@@ -48,15 +48,15 @@ public function count(Collection $collection)
             $em = $this->getEntityManager($collection);
 
             $assoc = $collection->getMapping();
-            $sourceMetadata = $em->getClassMetadata($assoc->sourceEntityName);
-            $targetMetadata = $em->getClassMetadata($assoc->targetEntityName);
+            $sourceMetadata = $em->getClassMetadata($assoc['sourceEntity']);
+            $targetMetadata = $em->getClassMetadata($assoc['targetEntity']);
 
             if (!count($targetMetadata->identifier) == 1) {
                 throw new \UnexpectedValueException("Only Relations with Entities using Single Primary Keys are supported.");
             }
 
             $dql = 'SELECT COUNT(r.' . $targetMetadata->identifier[0] . ') AS collectionCount '.
-                   'FROM ' . $sourceMetadata->name . ' o LEFT JOIN o.' . $assoc->sourceFieldName . ' r ' .
+                   'FROM ' . $sourceMetadata->name . ' o LEFT JOIN o.' . $assoc['fieldName'] . ' r ' .
                    'WHERE ' . $this->getWhereConditions($sourceMetadata);
             $query = $em->createQuery($dql);
 
@@ -99,17 +99,17 @@ public function getSliceQuery(PersistentCollection $collection, $limit, $offset
         $em = $this->getEntityManager($collection);
 
         $assoc = $collection->getMapping();
-        $sourceMetadata = $em->getClassMetadata($assoc->sourceEntityName);
-        $targetMetadata = $em->getClassMetadata($assoc->targetEntityName);
+        $sourceMetadata = $em->getClassMetadata($assoc['sourceEntity']);
+        $targetMetadata = $em->getClassMetadata($assoc['targetEntity']);
 
-        if ($assoc->isOwningSide && !$assoc->inversedBy) {
+        if ($assoc['isOwningSide'] && !$assoc['inversedBy']) {
             throw new \UnexpectedValueException("Only bi-directional collections can be sliced.");
         }
 
-        if ($assoc->isOwningSide) {
-            $assocField = $assoc->inversedBy;
+        if ($assoc['isOwningSide']) {
+            $assocField = $assoc['inversedBy'];
         } else {
-            $assocField = $assoc->mappedBy;
+            $assocField = $assoc['mappedBy'];
         }
 
         $dql = 'SELECT r FROM ' . $targetMetadata->name . ' r JOIN r.' . $assocField . ' o '.