Skip to content

fix(firestore): preserve async limit_to_last ordering #17879

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

Draft
Sanjays2402 wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −9
Draft

fix(firestore): preserve async limit_to_last ordering #17879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/google-cloud-firestore/google/cloud/firestore_v1/async_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ async def get(
for order in self._orders:
order.direction = _enum_from_direction(
self.DESCENDING
if order.direction == self.ASCENDING
if order.direction.name == self.ASCENDING
else self.ASCENDING
)
self._limit_to_last = False
Expand Down
15 changes: 7 additions & 8 deletions packages/google-cloud-firestore/tests/unit/v1/test_async_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,11 @@ async def test_asyncquery_get_w_read_time():


@pytest.mark.asyncio
async def test_asyncquery_get_limit_to_last():
from google.cloud import firestore
@pytest.mark.parametrize(
"direction, expected_direction",
[("DESCENDING", "ASCENDING"), ("ASCENDING", "DESCENDING")],
)
async def test_asyncquery_get_limit_to_last(direction, expected_direction):
from google.cloud.firestore_v1.base_query import _enum_from_direction

# Create a minimal fake GAPIC.
Expand All @@ -156,15 +159,11 @@ async def test_asyncquery_get_limit_to_last():

# Execute the query and check the response.
query = make_async_query(parent)
query = query.order_by(
"snooze", direction=firestore.AsyncQuery.DESCENDING
).limit_to_last(2)
query = query.order_by("snooze", direction=direction).limit_to_last(2)
returned = await query.get()

assert isinstance(returned, list)
assert query._orders[0].direction == _enum_from_direction(
firestore.AsyncQuery.ASCENDING
)
assert query._orders[0].direction == _enum_from_direction(expected_direction)
assert len(returned) == 2

snapshot = returned[0]
Expand Down
Loading