Permalink
Browse files

[1.6.x] Fixed #21760 -- prefetch_related used an inefficient query fo…

…r reverse FK.

Regression introduced by commit 9777442. Refs #21410.

Conflicts:
	tests/prefetch_related/tests.py

Backport of d3b71b9 from master
  • Loading branch information...
valtron authored and loic committed Apr 12, 2014
1 parent a357079 commit 1252b77824639fba398cf70586bdd75c42f86fdf
Showing with 25 additions and 1 deletion.
  1. +1 −0 AUTHORS
  2. +3 −1 django/db/models/fields/related.py
  3. +4 −0 docs/releases/1.6.3.txt
  4. +17 −0 tests/prefetch_related/tests.py
View
@@ -599,6 +599,7 @@ answer newbie questions, and generally made Django that much better:
David Tulig <david.tulig@gmail.com>
Justine Tunney <jtunney@lobstertech.com>
Amit Upadhyay <http://www.amitu.com/blog/>
+ valtron
Adam Vandenberg
Geert Vanderkelen
Vasil Vangelovski
@@ -279,7 +279,9 @@ def get_prefetch_queryset(self, instances):
# composite fields. In the meantime we take this practical approach to
# solve a regression on 1.6 when the reverse manager in hidden
# (related_name ends with a '+'). Refs #21410.
- if self.field.rel.is_hidden():
+ # The check for len(...) == 1 is a special case that allows the query
+ # to be join-less and smaller. Refs #21760.
+ if self.field.rel.is_hidden() or len(self.field.foreign_related_fields) == 1:
query = {'%s__in' % related_field.name: set(instance_attr(inst)[0] for inst in instances)}
else:
query = {'%s__in' % self.field.related_query_name(): instances}
View
@@ -67,5 +67,9 @@ Other bugfixes and changes
* Fixed :djadmin:`changepassword` on Windows
(`#22364 <https://code.djangoproject.com/ticket/22364>`_).
+* Fixed regression in ``prefetch_related`` that caused the related objects
+ query to include an unnecessary join
+ (`#21760 <https://code.djangoproject.com/ticket/21760>`_).
+
Additionally, Django's vendored version of six, :mod:`django.utils.six` has been
upgraded to the latest release (1.6.1).
@@ -2,9 +2,11 @@
from django.contrib.contenttypes.models import ContentType
from django.db import connection
+from django.db.models.query import get_prefetcher
from django.test import TestCase
from django.test.utils import override_settings
from django.utils import six
+from django.utils.encoding import force_text
from .models import (Author, Book, Reader, Qualification, Teacher, Department,
TaggedItem, Bookmark, AuthorAddress, FavoriteAuthors, AuthorWithAge,
@@ -677,3 +679,18 @@ def setUp(self):
def test_bug(self):
list(Author2.objects.prefetch_related('first_book', 'favorite_books'))
+
+
+class Ticket21760Tests(TestCase):
+
+ def setUp(self):
+ self.rooms = []
+ for _ in range(3):
+ house = House.objects.create()
+ for _ in range(3):
+ self.rooms.append(Room.objects.create(house = house))
+
+ def test_bug(self):
+ prefetcher = get_prefetcher(self.rooms[0], 'house')[0]
+ queryset = prefetcher.get_prefetch_queryset(list(Room.objects.all()))[0]
+ self.assertNotIn(' JOIN ', force_text(queryset.query))

0 comments on commit 1252b77

Please sign in to comment.