Fix offset/limit in union query builder

Author: tobyzerner

src/Laravel/UnionBuilder.php

@@ -8,11 +8,50 @@ class UnionBuilder implements Builder
 {
     private array $queryCalls = [];
     private array $outerQueryCalls = [];
+    private ?int $limit = null;
+    private int $offset = 0;
 
     public function __construct(protected array $queries)
     {
     }
 
+    public function skip(int $value): static
+    {
+        return $this->offset($value);
+    }
+
+    public function offset(int $value): static
+    {
+        $this->offset = max(0, $value);
+
+        return $this;
+    }
+
+    public function take(?int $value): static
+    {
+        return $this->limit($value);
+    }
+
+    public function limit(?int $value): static
+    {
+        if ($value >= 0) {
+            $this->limit = $value;
+        }
+
+        return $this;
+    }
+
+    public function orderBy($column, $direction = 'asc'): static
+    {
+        $this->queryCalls[] = fn($query) => $query
+            ->addSelect($column)
+            ->orderBy($column, $direction);
+
+        $this->outerQueryCalls[] = fn($query) => $query->orderBy($column, $direction);
+
+        return $this;
+    }
+
     public function count($columns = '*'): int
     {
         return $this->buildQuery()->count($columns);
@@ -31,6 +70,10 @@ protected function buildQuery()
             foreach ($this->queryCalls as $call) {
                 $call($query);
             }
+
+            if ($this->limit) {
+                $query->take($this->offset + $this->limit);
+            }
         }
 
         $outerQuery = array_shift($queries);
@@ -43,20 +86,16 @@ protected function buildQuery()
             $call($outerQuery);
         }
 
+        if ($this->limit) {
+            $outerQuery->skip($this->offset)->take($this->limit);
+        }
+
         return $outerQuery;
     }
 
     public function __call($method, $parameters)
     {
-        $call = $this->queryCalls[] = fn($query) => $query->$method(...$parameters);
-
-        if ($method === 'orderBy') {
-            $this->queryCalls[] = fn($query) => $query->addSelect($parameters[0]);
-        }
-
-        if (in_array($method, ['take', 'limit', 'skip', 'offset', 'orderBy'])) {
-            $this->outerQueryCalls[] = $call;
-        }
+        $this->queryCalls[] = fn($query) => $query->$method(...$parameters);
 
         return $this;
     }