Merge pull request #194 from sonata-project/addIdentifiersToQuery

adjust to qb refactoring
sonata-project · Oct 5, 2013 · 56fb874 · 56fb874
2 parents 8ba7543 + dfd4162
commit 56fb874
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/Model/ModelManager.php b/Model/ModelManager.php
@@ -316,20 +316,16 @@ public function getUrlsafeIdentifier($document)
      */
     public function addIdentifiersToQuery($class, ProxyQueryInterface $queryProxy, array $idx)
     {
+        /** @var $queryProxy ProxyQuery */
         $qb = $queryProxy->getQueryBuilder();
 
-        $constraint = null;
+        $orX = $qb->andWhere()->orX();
 
         foreach ($idx as $id) {
             $path = $this->getBackendId($id);
-            $condition = $qb->expr()->eqPath($path);
-            if ($constraint) {
-                $constraint = $qb->expr()->orx($constraint, $condition);
-            } else {
-                $constraint = $condition;
-            }
+            // this selector depends on the default in self::createQuery not being changed
+            $orX->same($path, 'a');
         }
-        $qb->andWhere($constraint);
     }
 
     /**