Skip to content

Fix fetching related object with ID = 0 #1366

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

Merged
long2ice merged 3 commits into from
Apr 18, 2023
Merged

Fix fetching related object with ID = 0 #1366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fea1d7e
Fix fetching related object with ID = 0
Apr 4, 2023
33b532a
Move new fk 0 tests to existing test_0_value_fk test case
Apr 5, 2023
f6f2b35
Merge branch 'tortoise:develop' into support_fk_id_0
s-rakowski Apr 18, 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
12 changes: 12 additions & 0 deletions tests/test_relations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,18 @@ async def test_0_value_fk(self):
single_reload = await Single.get(id=single.id)
assert (await single_reload.extra).id == 0

tournament_0 = await Tournament.create(name="tournament zero", id=0)
await Event.create(name="event-zero", tournament=tournament_0)

e = await Event.get(name="event-zero")
id_before_fetch = e.tournament_id
await e.fetch_related("tournament")
id_after_fetch = e.tournament_id
self.assertEqual(id_before_fetch, id_after_fetch)

event_0 = await Event.get(name="event-zero").prefetch_related("tournament")
self.assertEqual(event_0.tournament, tournament_0)


class TestDoubleFK(test.TestCase):
select_match = r'SELECT [`"]doublefk[`"].[`"]name[`"] [`"]name[`"]'
Expand Down
2 changes: 1 addition & 1 deletion tortoise/backends/base/executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ async def _prefetch_direct_relation(
related_objects_for_fetch: Dict[str, list] = {}
relation_key_field = f"{field}_id"
for instance in instance_list:
if getattr(instance, relation_key_field):
if getattr(instance, relation_key_field) is not None:
key = cast(RelationalField, instance._meta.fields_map[field]).to_field
if key not in related_objects_for_fetch:
related_objects_for_fetch[key] = []
Expand Down