Commit 2b1934ff authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Fixed a problem when computing deferred fields on multiple related models. 

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
parent 0a89a57f

django/db/models/sql/query.py

+4 −3
Original line number Diff line number Diff line
@@ -574,12 +574,13 @@ class BaseQuery(object): 
        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]

tests/regressiontests/defer_regress/models.py

+3 −0
Original line number Diff line number Diff line
@@ -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 @@ Some further checks for select_related() and inherited model behaviour 
>>> 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>]



"""

}