encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-25 07:29:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ensure CursorPagination respects nulls in the ordering field

Browse Source
This commit is contained in:
ddelange 2023-03-20 08:27:09 +01:00 committed by GitHub
parent c9e7b68a4c
commit 0f03592711
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/pagination.py
View File

@ -10,6 +10,7 @@ from urllib import parse
from django.core.paginator import InvalidPage
from django.core.paginator import Paginator as DjangoPaginator
from django.db.models import Q
from django.template import loader
from django.utils.encoding import force_str
from django.utils.translation import gettext_lazy as _
@ -631,7 +632,10 @@ class CursorPagination(BasePagination):
else:
kwargs = {order_attr + '__gt': current_position}
queryset = queryset.filter(**kwargs)
# If some records contain a null for the ordering field, don't lose them.
filter_query = Q(**kwargs) | Q(**{order_attr + '__isnull': True})
queryset = queryset.filter(filter_query)
# If we have an offset cursor then offset the entire page by that amount.
# We also always fetch an extra item in order to determine if there is a