Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed a problem when computing deferred fields on multiple related mo…

…dels.

Fixed #10710, as this fixes the second bug reported there.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 2b1934ff3c3f80f58cc35bdcc03ae1b0ea6eb17e 1 parent 0a89a57
Malcolm Tredinnick malcolmt authored
7 django/db/models/sql/query.py
View
@@ -574,12 +574,13 @@ def deferred_to_data(self, target, callback):
if not field_names:
return
columns = set()
- cur_model = self.model
- opts = cur_model._meta
+ orig_opts = self.model._meta
seen = {}
- must_include = {cur_model: set([opts.pk])}
+ must_include = {self.model: set([orig_opts.pk])}
for field_name in field_names:
parts = field_name.split(LOOKUP_SEP)
+ cur_model = self.model
+ opts = orig_opts
for name in parts[:-1]:
old_model = cur_model
source = opts.get_field_by_name(name)[0]
3  tests/regressiontests/defer_regress/models.py
View
@@ -24,6 +24,7 @@ class Child(models.Model):
class Leaf(models.Model):
name = models.CharField(max_length=10)
child = models.ForeignKey(Child)
+ second_child = models.ForeignKey(Child, related_name="other", null=True)
value = models.IntegerField(default=42)
def __unicode__(self):
@@ -87,6 +88,8 @@ def __unicode__(self):
>>> obj = Leaf.objects.only("name", "child").select_related()[0]
>>> obj.child.name
u'c1'
+>>> Leaf.objects.select_related().only("child__name", "second_child__name")
+[<Leaf_Deferred_name_value: l1>]
"""
}
Please sign in to comment.
Something went wrong with that request. Please try again.