Merge pull request #193 from peter-gribanov/index_by_field

Allow use a Field operand in IndexBy spec
Happyr · May 7, 2019 · 501849a · 501849a
2 parents 83b98a8 + a4e4dc2
commit 501849a
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/Query/IndexBy.php b/src/Query/IndexBy.php
@@ -3,16 +3,17 @@
 namespace Happyr\DoctrineSpecification\Query;
 
 use Doctrine\ORM\QueryBuilder;
+use Happyr\DoctrineSpecification\Operand\Field;
 
 /**
  * Class IndexBy.
  */
 class IndexBy implements QueryModifier
 {
     /**
-     * Field name.
+     * Field.
      *
-     * @var string
+     * @var Field
      */
     private $field;
 
@@ -26,11 +27,14 @@ class IndexBy implements QueryModifier
     /**
      * IndexBy constructor.
      *
-     * @param string $field    Field name for indexing
-     * @param string $dqlAlias DQL alias of field
+     * @param Field|string $field    Field name for indexing
+     * @param string       $dqlAlias DQL alias of field
      */
     public function __construct($field, $dqlAlias = null)
     {
+        if (!($field instanceof Field)) {
+            $field = new Field($field);
+        }
         $this->field = $field;
         $this->dqlAlias = $dqlAlias;
     }
@@ -44,6 +48,6 @@ public function modify(QueryBuilder $qb, $dqlAlias)
             $dqlAlias = $this->dqlAlias;
         }
 
-        $qb->indexBy($dqlAlias, sprintf('%s.%s', $dqlAlias, $this->field));
+        $qb->indexBy($dqlAlias, $this->field->transform($qb, $dqlAlias));
     }
 }