Ticket #11387: test_11387.diff

tests/regressiontests/generic_relations_regress/tests.py

@@ -1 +1 @@
 from django.test import TestCase
 from django.contrib.contenttypes.models import ContentType
-from models import Link, Place, Restaurant
+from models import Link, Place, Restaurant, Company
 
 class GenericRelationTests(TestCase):
     
@@ -16 +16 @@
         l2 = Link.objects.create(content_object=r)
         self.assertEqual(list(p.links.all()), [l1])
         self.assertEqual(list(r.links.all()), [l2])
-        
- No newline at end of file
+
+    def test_generic_relation_ordering(self):
+        """
+        Test that ordering over a generic relation does not include extraneous
+        duplicate results, nor excludes rows not participating in the relation.
+        """
+        p1 = Place.objects.create(name="South Park")
+        p2 = Place.objects.create(name="The City")
+        c = Company.objects.create(name="Chubby's Intl.")
+        l1 = Link.objects.create(content_object=p1)
+        l2 = Link.objects.create(content_object=c)
+
+        places = list(Place.objects.order_by('links__id'))
+        def count_places(place):
+            return len(filter(lambda p: p.id == place.id, places))
+
+        self.assertEqual(len(places), 2)
+        self.assertEqual(count_places(p1), 1)
+        self.assertEqual(count_places(p2), 1)

tests/regressiontests/generic_relations_regress/models.py

@@ -19 +19 @@
     
 class Restaurant(Place): 
     def __unicode__(self):
-        return "Restaurant: %s" % self.name
- No newline at end of file
+        return "Restaurant: %s" % self.name
+
+class Company(models.Model): 
+    name = models.CharField(max_length=100)
+    links = generic.GenericRelation(Link)
+
+    def __unicode__(self):
+        return "Company: %s" % self.name
+ No newline at end of file