Skip to content

Fix crash when trying to delete non-existent record #372

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.

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

Merged
merged 3 commits into from
Sep 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 aredis_om/model/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
from pydantic.typing import NoArgAnyCallable
from pydantic.utils import Representation
from redis.commands.json.path import Path
from redis.exceptions import ResponseError
from typing_extensions import Protocol, get_args, get_origin
from ulid import ULID

Expand Down Expand Up @@ -796,7 +797,10 @@ async def update(self, use_transaction=True, **field_values):
async def delete(self):
"""Delete all matching records in this query."""
# TODO: Better response type, error detection
return await self.model.db().delete(*[m.key() for m in await self.all()])
try:
return await self.model.db().delete(*[m.key() for m in await self.all()])
except ResponseError:
return 0

async def __aiter__(self):
if self._model_cache:
Expand Down
21 changes: 21 additions & 0 deletions tests/test_hash_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,27 @@ async def test_exact_match_queries(members, m):
assert actual == [member1]


@py_test_mark_asyncio
async def test_delete_non_exist(members, m):
member1, member2, member3 = members
actual = await m.Member.find(
(m.Member.last_name == "Brookins") & ~(m.Member.first_name == "Andrew")
).all()
assert actual == [member2]
assert (
1
== await m.Member.find(
(m.Member.last_name == "Brookins") & ~(m.Member.first_name == "Andrew")
).delete()
)
assert (
0
== await m.Member.find(
(m.Member.last_name == "Brookins") & ~(m.Member.first_name == "Andrew")
).delete()
)


@py_test_mark_asyncio
async def test_full_text_search_queries(members, m):
member1, member2, member3 = members
Expand Down