Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #7371 -- Fixed an edge case when ordering on related models.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 050d0a1b75add2240760c4ba09f1fdd6e9a677f0 1 parent c17e326
@malcolmt malcolmt authored
View
5 django/db/models/sql/query.py
@@ -626,6 +626,11 @@ def find_ordering_name(self, name, opts, alias=None, default_order='ASC',
alias, False)
alias = joins[-1]
col = target.column
+ if not field.rel:
+ # To avoid inadvertent trimming of a necessary alias, use the
+ # refcount to show that we are referencing a non-relation field on
+ # the model.
+ self.ref_alias(alias)
# Must use left outer joins for nullable fields.
for join in joins:
View
15 tests/regressiontests/queries/models.py
@@ -172,6 +172,17 @@ class Child(models.Model):
person = models.OneToOneField(Member, primary_key=True)
parent = models.ForeignKey(Member, related_name="children")
+# Custom primary keys interfered with ordering in the past.
+class CustomPk(models.Model):
+ name = models.CharField(max_length=10, primary_key=True)
+ extra = models.CharField(max_length=10)
+
+ class Meta:
+ ordering = ['name', 'extra']
+
+class Related(models.Model):
+ custom = models.ForeignKey(CustomPk)
+
__test__ = {'API_TESTS':"""
>>> t1 = Tag.objects.create(name='t1')
@@ -786,5 +797,9 @@ class Child(models.Model):
>>> n1.annotation_set.filter(Q(tag=t5) | Q(tag__children=t5) | Q(tag__children__children=t5))
[<Annotation: a1>]
+Bug #7371
+>>> Related.objects.order_by('custom')
+[]
+
"""}
Please sign in to comment.
Something went wrong with that request. Please try again.