added a getAlias() method, switch back to defaulting to 'a' as the alias

sonata-project · Oct 8, 2013 · c9c4902 · c9c4902
1 parent 5525e7b
commit c9c4902
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 17 deletions.
diff --git a/Admin/Admin.php b/Admin/Admin.php
@@ -59,7 +59,7 @@ public function getRootPath()
      */
     public function createQuery($context = 'list')
     {
-        $query = $this->getModelManager()->createQuery($this->getClass(), 'a');
+        $query = $this->getModelManager()->createQuery($this->getClass());
         $query->setRootPath($this->getRootPath());
 
         foreach ($this->extensions as $extension) {

diff --git a/Datagrid/ProxyQuery.php b/Datagrid/ProxyQuery.php
@@ -77,7 +77,7 @@ class ProxyQuery implements ProxyQueryInterface
      *                                   of the document.
      * @throws \InvalidArgumentException if alias is not a string or an empty string
      */
-    public function __construct(QueryBuilder $queryBuilder, $alias = 'a')
+    public function __construct(QueryBuilder $queryBuilder, $alias)
     {
         if (!is_string($alias) || '' === $alias) {
             throw new \InvalidArgumentException('$alias must be a non empty string');
@@ -87,6 +87,14 @@ public function __construct(QueryBuilder $queryBuilder, $alias = 'a')
         $this->alias = $alias;
     }
 
+    /**
+     * @return string
+     */
+    public function getAlias()
+    {
+        return $this->alias;
+    }
+
     /**
      * @param string $root  root path to restrict what documents to find.
      */

diff --git a/Filter/Filter.php b/Filter/Filter.php
@@ -28,7 +28,7 @@ abstract class Filter extends BaseFilter
     public function apply($queryBuilder, $value)
     {
         $this->value = $value;
-        $this->filter($queryBuilder, null, $this->getFieldName(), $value);
+        $this->filter($queryBuilder, $queryBuilder->getAlias(), $this->getFieldName(), $value);
     }
 
     /**
@@ -41,9 +41,9 @@ protected function getWhere(ProxyQuery $proxy)
         $queryBuilder = $proxy->getQueryBuilder();
         if ($this->getCondition() == self::CONDITION_OR) {
             return $queryBuilder->orWhere();
-        } else {
-            return $queryBuilder->andWhere();
         }
+
+        return $queryBuilder->andWhere();
     }
 
     /**

diff --git a/Filter/NodeNameFilter.php b/Filter/NodeNameFilter.php
@@ -36,11 +36,11 @@ public function filter(ProxyQueryInterface $proxyQuery, $alias, $field, $data)
 
         switch ($data['type']) {
             case ChoiceType::TYPE_EQUAL:
-                $where->eq()->localName('a')->literal($data['value']);
+                $where->eq()->localName($alias)->literal($data['value']);
                 break;
             case ChoiceType::TYPE_CONTAINS:
             default:
-                $where->like()->localName('a')->literal('%'.$data['value'].'%');
+                $where->like()->localName($alias)->literal('%'.$data['value'].'%');
         }
 
         // filter is active as we have now modified the query

diff --git a/Model/ModelManager.php b/Model/ModelManager.php
@@ -206,13 +206,13 @@ public function getParentFieldDescription($parentAssociationMapping, $class)
     /**
      * @param string $class the fully qualified class name to search for
      * @param string $alias alias to use for this class when accessing fields,
-     *                      defaults to 'o'.
+     *                      defaults to 'a'.
      *
      * @return ProxyQueryInterface
      *
      * @throws \InvalidArgumentException if alias is not a string or an empty string
      */
-    public function createQuery($class, $alias = 'o')
+    public function createQuery($class, $alias = 'a')
     {
         $qb = $this->getDocumentManager()->createQueryBuilder();
         $qb->from()->document($class, $alias);
@@ -318,8 +318,7 @@ public function addIdentifiersToQuery($class, ProxyQueryInterface $queryProxy, a
 
         foreach ($idx as $id) {
             $path = $this->getBackendId($id);
-            // this selector depends on the default in self::createQuery not being changed
-            $orX->same($path, 'a');
+            $orX->same($path, $queryProxy->getAlias());
         }
     }
 

diff --git a/Tests/Datagrid/ProxyQueryTest.php b/Tests/Datagrid/ProxyQueryTest.php
@@ -35,7 +35,7 @@ public function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->pq = new ProxyQuery($this->qb);
+        $this->pq = new ProxyQuery($this->qb, 'a');
     }
 
     public function testConstructor()

diff --git a/Tests/Filter/NodeNameFilterTest.php b/Tests/Filter/NodeNameFilterTest.php
@@ -29,21 +29,21 @@ public function getChoiceTypeForEmptyTests()
 
     public function testFilterNullData()
     {
-        $res = $this->filter->filter($this->proxyQuery, null, 'somefield', null);
+        $res = $this->filter->filter($this->proxyQuery, 'a', 'somefield', null);
         $this->assertNull($res);
         $this->assertFalse($this->filter->isActive());
     }
 
     public function testFilterEmptyArrayData()
     {
-        $res = $this->filter->filter($this->proxyQuery, null, 'somefield', array());
+        $res = $this->filter->filter($this->proxyQuery, 'a', 'somefield', array());
         $this->assertNull($res);
         $this->assertFalse($this->filter->isActive());
     }
 
     public function testFilterEmptyArrayDataSpecifiedType()
     {
-        $res = $this->filter->filter($this->proxyQuery, null, 'somefield', array('type' => ChoiceType::TYPE_EQUAL));
+        $res = $this->filter->filter($this->proxyQuery, 'a', 'somefield', array('type' => ChoiceType::TYPE_EQUAL));
         $this->assertNull($res);
         $this->assertFalse($this->filter->isActive());
     }
@@ -53,7 +53,7 @@ public function testFilterEmptyArrayDataWithMeaninglessValue()
         $this->proxyQuery->expects($this->never())
             ->method('andWhere');
 
-        $this->filter->filter($this->proxyQuery, null, 'somefield', array('type' => ChoiceType::TYPE_EQUAL, 'value' => ' '));
+        $this->filter->filter($this->proxyQuery, 'a', 'somefield', array('type' => ChoiceType::TYPE_EQUAL, 'value' => ' '));
         $this->assertFalse($this->filter->isActive());
     }
 
@@ -78,7 +78,7 @@ public function testFilterSwitch($operatorMethod, $choiceType, $expectedValue =
 
         $this->filter->filter(
             $this->proxyQuery,
-            null,
+            'a',
             'somefield',
             array('type' => $choiceType, 'value' => 'somevalue')
         );