Skip to content

Commit d63e6a8

Browse files
committed
Merge branch 'master' into 3.2-merge
2 parents 0b8bca6 + 66a65f7 commit d63e6a8

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

src/Concerns/BuildsQueries.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,8 @@ protected function getOriginalColumnNameForCursorPagination(Builder|\Hyperf\Data
478478

479479
$alias = substr($column, $position + 4);
480480

481-
if ($parameter === $alias || $builder->getGrammar()->wrap($parameter) === $alias) {
481+
$grammar = $builder instanceof Builder ? $builder->getQuery()->getGrammar() : $builder->getGrammar();
482+
if ($parameter === $alias || $grammar->wrap($parameter) === $alias) {
482483
return $original;
483484
}
484485
}

0 commit comments

Comments
 (0)