Changeset 7786

Timestamp:

06/29/08 06:15:48 (2 months ago)

Author:

mtredinnick

Message:

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

Files:

• django/trunk/django/db/models/sql/query.py (modified) (1 diff)
• django/trunk/tests/regressiontests/queries/models.py (modified) (2 diffs)

django/trunk/django/db/models/sql/query.py

@@ -627 +627 @@
-        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.

django/trunk/tests/regressiontests/queries/models.py

@@ -172 +172 @@
-    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)
-
-
@@ -787 +798 @@
-[<Annotation: a1>]
-
+Bug #7371
+>>> Related.objects.order_by('custom')
+[]
+
-"""}
-