Ticket #8291: 8291_2.diff

django/db/models/options.py

@@ -253 +253 @@
         self._m2m_cache = cache
 
     def get_field(self, name, many_to_many=True):
+        if name == 'pk': # replace special value "pk" with primary key attribute name
+            attname = self.pk.attname
+        else:
+            attname = name
         """
         Returns the requested field by name. Raises FieldDoesNotExist on error.
         """
         to_search = many_to_many and (self.fields + self.many_to_many) or self.fields
         for f in to_search:
-            if f.name == name:
+            if f.name == attname:
                 return f
         raise FieldDoesNotExist, '%s has no field named %r' % (self.object_name, name)
 

tests/modeltests/ordering/models.py

@@ -24 +24 @@
     def __unicode__(self):
         return self.headline
 
+class Writer(models.Model):
+    name = models.CharField(max_length=50)
+    class Meta:
+        ordering = ('pk',)
+
+    def __unicode__(self):
+        return self.name
+
 __test__ = {'API_TESTS':"""
 # Create a couple of Articles.
 >>> from datetime import datetime
@@ -36 +44 @@
 >>> a4 = Article(headline='Article 4', pub_date=datetime(2005, 7, 28))
 >>> a4.save()
 
+# Create a couple of Writers.
+>>> w1 = Writer(name='Kurt Vonnegut')
+>>> w1.save()
+>>> w2 = Writer(name='Joseph Heller')
+>>> w2.save()
+>>> w3 = Writer(name='Douglas Adams')
+>>> w3.save()
+
 # By default, Article.objects.all() orders by pub_date descending, then
 # headline ascending.
 >>> Article.objects.all()
@@ -86 +102 @@
 >>> Article.objects.extra(select={'order': 'pub_date'}, order_by=['order', 'headline'])
 [<Article: Article 1>, <Article: Article 2>, <Article: Article 3>, <Article: Article 4>]
 
+# Use the special value 'pk' to order on the primary key field
+>>> Writer.objects.order_by('pk')
+[<Writer: Kurt Vonnegut>, <Writer: Joseph Heller>, <Writer: Douglas Adams>]
 """}