Fix aliasing with cursor pagination

vanthao03596 · Aug 7, 2021 · 4f0f04c · 4f0f04c
1 parent 8b6afa6
commit 4f0f04c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/EloquentCursorPaginateMixin.php b/src/EloquentCursorPaginateMixin.php
@@ -108,8 +108,10 @@ protected function getOriginalColumnNameForCursorPagination()
 
             if (! is_null($columns)) {
                 foreach ($columns as $column) {
-                    if (stripos($column, ' as ') !== false) {
-                        [$original, $alias] = explode(' as ', $column);
+                    if (($position = stripos($column, ' as ')) !== false) {
+                        $as = substr($column, $position, 4);
+
+                        [$original, $alias] = explode($as, $column);
 
                         if ($parameter === $alias) {
                             return $original;

diff --git a/src/Query/Builder.php b/src/Query/Builder.php
@@ -133,8 +133,10 @@ protected function getOriginalColumnNameForCursorPagination($builder, string $pa
 
         if (! is_null($columns)) {
             foreach ($columns as $column) {
-                if (stripos($column, ' as ') !== false) {
-                    [$original, $alias] = explode(' as ', $column);
+                if (($position = stripos($column, ' as ')) !== false) {
+                    $as = substr($column, $position, 4);
+
+                    [$original, $alias] = explode($as, $column);
 
                     if ($parameter === $alias) {
                         return $original;