Add support for EagerLoader (#31)

lampager · May 19, 2022 · 0fa0b91 · 0fa0b91
1 parent aa2ad68
commit 0fa0b91
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/Paginator.php b/src/Paginator.php
@@ -111,7 +111,8 @@ protected function compileSelect(Select $select)
             ->where($this->builder->clause('where'))
             ->modifier($this->builder->clause('modifier'))
             ->join($this->builder->clause('join'))
-            ->epilog($this->builder->clause('epilog'));
+            ->epilog($this->builder->clause('epilog'))
+            ->setEagerLoader($this->builder->getEagerLoader());
 
         $this
             ->compileWhere($builder, $select)
@@ -152,8 +153,14 @@ protected function compileWhereGroup(ConditionGroup $group)
      */
     protected function compileOrderBy(Query $builder, Select $select)
     {
+        $alias = $builder->getRepository()->getAlias();
+
         foreach ($select->orders() as $i => $order) {
-            $builder->order([$order->column() => $order->order()], $i === 0);
+            $column = $order->column();
+            if (strpos($column, '.') === false) {
+                $column = $alias . '.' . $column;
+            }
+            $builder->order([$column => $order->order()], $i === 0);
         }
         return $this;
     }