Fixed #10028 -- Fixed a problem when ordering by related models.

Some results were inadvertently being excluded if we were ordering across a
nullable relation which itself ordering by a non-nullable relation.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2009-02-28 02:59:40 +00:00
parent 4ad77254b4
commit 415ffa8df5
2 changed files with 35 additions and 3 deletions

View File

@ -716,7 +716,7 @@ class BaseQuery(object):
result, params = [], [] result, params = [], []
if self.group_by is not None: if self.group_by is not None:
group_by = self.group_by or [] group_by = self.group_by or []
extra_selects = [] extra_selects = []
for extra_select, extra_params in self.extra_select.itervalues(): for extra_select, extra_params in self.extra_select.itervalues():
extra_selects.append(extra_select) extra_selects.append(extra_select)
@ -834,8 +834,9 @@ class BaseQuery(object):
# the model. # the model.
self.ref_alias(alias) self.ref_alias(alias)
# Must use left outer joins for nullable fields. # Must use left outer joins for nullable fields and their relations.
self.promote_alias_chain(joins) self.promote_alias_chain(joins,
self.alias_map[joins[0]][JOIN_TYPE] == self.LOUTER)
# If we get to this point and the field is a relation to another model, # If we get to this point and the field is a relation to another model,
# append the default ordering for that model. # append the default ordering for that model.

View File

@ -238,6 +238,32 @@ class PointerA(models.Model):
class PointerB(models.Model): class PointerB(models.Model):
connection = models.ForeignKey(SharedConnection) connection = models.ForeignKey(SharedConnection)
# Multi-layer ordering
class SingleObject(models.Model):
name = models.CharField(max_length=10)
class Meta:
ordering = ['name']
def __unicode__(self):
return self.name
class RelatedObject(models.Model):
single = models.ForeignKey(SingleObject)
class Meta:
ordering = ['single']
class Plaything(models.Model):
name = models.CharField(max_length=10)
others = models.ForeignKey(RelatedObject, null=True)
class Meta:
ordering = ['others']
def __unicode__(self):
return self.name
__test__ = {'API_TESTS':""" __test__ = {'API_TESTS':"""
>>> t1 = Tag.objects.create(name='t1') >>> t1 = Tag.objects.create(name='t1')
@ -1044,6 +1070,11 @@ Bug #9985 -- qs.values_list(...).values(...) combinations should work.
>>> Annotation.objects.filter(notes__in=Note.objects.filter(note="n1").values_list('note').values('id')) >>> Annotation.objects.filter(notes__in=Note.objects.filter(note="n1").values_list('note').values('id'))
[<Annotation: a1>] [<Annotation: a1>]
Bug #10028 -- ordering by model related to nullable relations(!) should use
outer joins, so that all results are included.
>>> _ = Plaything.objects.create(name="p1")
>>> Plaything.objects.all()
[<Plaything: p1>]
"""} """}
# In Python 2.3 and the Python 2.6 beta releases, exceptions raised in __len__ # In Python 2.3 and the Python 2.6 beta releases, exceptions raised in __len__