8000 [WIP] Don't do aditional queries if order_with_respect_to is a foreign key of a foreign key by rafammpp · Pull Request #294 · django-ordered-model/django-ordered-model · GitHub
[go: up one dir, main page]
Skip to content

[WIP] Don't do aditional queries if order_with_respect_to is a foreign key of a foreign key #294

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

[WIP] Don't do aditional queries if order_with_respect_to is a foreign key of a foreign key #294

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
6cf070f
remove instance attr and remake save method
rafammpp Mar 28, 2023
1766d7a
new tests and change querycount assert on others
rafammpp Mar 29, 2023
b19a3e8
fix non catching exception
rafammpp Mar 30, 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
21 changes: 13 additions & 8 deletions ordered_model/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ class Meta:

def __init__(self, *args, **kwargs):
super(OrderedModelBase, self).__init__(*args, **kwargs)
self._original_wrt_map = self._wrt_map()

def _wrt_map(self):
d = {}
Expand Down Expand Up @@ -208,20 +207,26 @@ def next(self):

def save(self, *args, **kwargs):
order_field_name = self.order_field_name
wrt_changed = self._wrt_map() != self._original_wrt_map
wrt_changed = False
if self.order_with_respect_to and self.pk:
try:
original_wrt_map = self.__class__.objects.get(pk=self.pk)._wrt_map()
except self.__class__.DoesNotExist:
# the object is new, so we don't need to check for wrt changes
pass
else:
wrt_changed = self._wrt_map() != original_wrt_map

if wrt_changed and getattr(self, order_field_name) is not None:
# do delete-like upshuffle using original_wrt values!
qs = self.get_ordering_queryset(wrt=self._original_wrt_map)
qs.above_instance(self).decrease_order()
if wrt_changed and getattr(self, order_field_name) is not None:
# do delete-like upshuffle using original_wrt values!
qs = self.get_ordering_queryset(wrt=original_wrt_map)
qs.above_instance(self).decrease_order()

if getattr(self, order_field_name) is None or wrt_changed:
order = self.get_ordering_queryset().get_next_order()
setattr(self, order_field_name, order)
super().save(*args, **kwargs)

self._original_wrt_map = self._wrt_map()

def delete(self, *args, extra_update=None, **kwargs):
# Flag re-ordering performed so that post_delete signal
# does not duplicate the re-ordering. See signals.py
Expand Down
20 changes: 19 additions & 1 deletion tests/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ def setUp(self):

def test_reorder_when_field_value_changed(self):
self.u0_a2.user = self.u1
with assertNumQueries(self, 3):
with assertNumQueries(self, 4):
self.u0_a2.save()

self.assertSequenceEqual(
Expand Down Expand Up @@ -902,6 +902,24 @@ def setUp(self):
self.u1_g1_i1 = self.u1_g1.items.create()
self.u1_g2_i1 = self.u1_g2.items.create()

def test_query_count_on_create_model(self):
with self.assertNumQueries(2):
# 1 for calculating the order, 1 for inserting the model
self.u1_g1.items.create()

def test_query_count_on_save(self):
with self.assertNumQueries(3):
# 2 to check for wrt field changes, 1 to update the model.
self.u1_g1_i1.save()

def test_query_count_on_qs(self):
with self.assertNumQueries(1):
list(GroupedItem.objects.all())

def test_query_count_on_select_related_qs(self):
with self.assertNumQueries(1):
list(GroupedItem.objects.select_related("group__user").all())

def test_saved_order(self):
self.assertSequenceEqual(
GroupedItem.objects.filter(group__user=self.u1).values_list("pk", "order"),
Expand Down
0