Skip to content

Commit ac89d7b

Browse files
committed
fix(firestore): preserve async limit_to_last ordering
1 parent 270c7fe commit ac89d7b

2 files changed

Lines changed: 8 additions & 9 deletions

File tree

packages/google-cloud-firestore/google/cloud/firestore_v1/async_query.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ async def get(
239239
for order in self._orders:
240240
order.direction = _enum_from_direction(
241241
self.DESCENDING
242-
if order.direction == self.ASCENDING
242+
if order.direction.name == self.ASCENDING
243243
else self.ASCENDING
244244
)
245245
self._limit_to_last = False

packages/google-cloud-firestore/tests/unit/v1/test_async_query.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,11 @@ async def test_asyncquery_get_w_read_time():
129129

130130

131131
@pytest.mark.asyncio
132-
async def test_asyncquery_get_limit_to_last():
133-
from google.cloud import firestore
132+
@pytest.mark.parametrize(
133+
"direction, expected_direction",
134+
[("DESCENDING", "ASCENDING"), ("ASCENDING", "DESCENDING")],
135+
)
136+
async def test_asyncquery_get_limit_to_last(direction, expected_direction):
134137
from google.cloud.firestore_v1.base_query import _enum_from_direction
135138

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

157160
# Execute the query and check the response.
158161
query = make_async_query(parent)
159-
query = query.order_by(
160-
"snooze", direction=firestore.AsyncQuery.DESCENDING
161-
).limit_to_last(2)
162+
query = query.order_by("snooze", direction=direction).limit_to_last(2)
162163
returned = await query.get()
163164

164165
assert isinstance(returned, list)
165-
assert query._orders[0].direction == _enum_from_direction(
166-
firestore.AsyncQuery.ASCENDING
167-
)
166+
assert query._orders[0].direction == _enum_from_direction(expected_direction)
168167
assert len(returned) == 2
169168

170169
snapshot = returned[0]

0 commit comments

Comments
 (0)