Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure CursorPagination respects nulls in the ordering field #8912

Merged
merged 9 commits into from
Apr 8, 2023
Merged

Ensure CursorPagination respects nulls in the ordering field #8912

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0f03592
Ensure CursorPagination respects nulls in the ordering field
ddelange Mar 20, 2023
df5d07a
Lint
ddelange Mar 20, 2023
e44d8de
Fix pagination tests
ddelange Mar 22, 2023
a1866b3
Add test_ascending with nulls
ddelange Mar 23, 2023
b089edc
Push tests for nulls
ddelange Mar 23, 2023
0dd0873
Test pass
ddelange Mar 24, 2023
c535420
Add comment
ddelange Mar 24, 2023
8a16457
Fix test for django30
ddelange Apr 3, 2023
d579b50
Merge branch 'encode:master' into patch-1
ddelange Apr 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion rest_framework/pagination.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

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 _
Expand Down Expand Up @@ -631,7 +632,10 @@ def paginate_queryset(self, queryset, request, view=None):
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
Expand Down