Support database expressions as custom limit columns

staudenmeir · Feb 10, 2023 · defcb62 · defcb62
1 parent cab2da7
commit defcb62
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/Traits/BuildsGroupLimitQueries.php b/src/Traits/BuildsGroupLimitQueries.php
@@ -41,16 +41,19 @@ public function get($columns = ['*'])
             return $items;
         }
 
-        $column = last(explode('.', $this->groupLimit['column']));
+        $keys = ['laravel_row'];
 
-        $keys = [
-            'laravel_row',
-            '@laravel_partition := '.$this->grammar->wrap($column),
-            '@laravel_partition := '.$this->grammar->wrap('pivot_'.$column),
-        ];
+        if (is_string($this->groupLimit['column'])) {
+            $column = last(explode('.', $this->groupLimit['column']));
+
+            $keys[] = '@laravel_partition := '.$this->grammar->wrap($column);
+            $keys[] = '@laravel_partition := '.$this->grammar->wrap('pivot_'.$column);
+        }
 
         foreach ($items as $item) {
-            unset($item->{$keys[0]}, $item->{$keys[1]}, $item->{$keys[2]});
+            foreach ($keys as $key) {
+                unset($item->$key);
+            }
         }
 
         return $items;