Ticket #11263: generic_relations_inheritance_order_test.2.diff

tests/regressiontests/generic_relations_regress/tests.py

@@ -70 +70 @@
             Q(notes__note__icontains=r'other note'))
         self.assertTrue(org_contact in qs)
 
+    def test_inherited_models_order(self):
+        """
+        Test for "Bug in lookup with generic relation in model inheritance"
+        
+        #11263
+        """
+        media = Media.objects.create()
+        photo = Photo.objects.create()
 
+        photo_order = Order.objects.create(content_object=photo, status='ordered')
+        media_order = Order.objects.create(content_object=media, status='ordered')
 
+        # add some other orders to the db
+        Order.objects.create(content_object=media, status='ordered')
+        Order.objects.create(content_object=media, status='ordered')
+
+        Order.objects.create(content_object=photo, status='ordered')
+        Order.objects.create(content_object=photo, status='ordered')
+        Order.objects.create(content_object=photo, status='ordered')
+
+#        print photo.order.filter(status='ordered').query,
+#        print Photo.objects.filter(order__status='ordered').query
+
+        self.assertEqual(7, Order.objects.filter(status='ordered').count())
+
+        self.assertEqual(media.order.filter(status='ordered').count(),
+                         Media.objects.filter(order__status='ordered').count())
+
+        self.assertEqual(photo.order.filter(status='ordered').count(),
+                         Photo.objects.filter(order__status='ordered').count())

tests/regressiontests/generic_relations_regress/models.py

@@ -4 +4 @@
 
 __all__ = ('Link', 'Place', 'Restaurant', 'Person', 'Address', 
            'CharLink', 'TextLink', 'OddRelation1', 'OddRelation2', 
-           'Contact', 'Organization', 'Note')
+           'Contact', 'Organization', 'Note', 'Photo', 'Order', 'Media')
 
 class Link(models.Model):
     content_type = models.ForeignKey(ContentType)
@@ -77 +77 @@
     name = models.CharField(max_length=255)
     contacts = models.ManyToManyField(Contact, related_name='organizations')
 
+# models for test_inherited_models_order (#11263)
+class Order(models.Model):
+    content_type = models.ForeignKey(ContentType)    
+    object_id = models.PositiveIntegerField()
+    content_object = generic.GenericForeignKey()
+    status = models.CharField(max_length=10, default='ordered')
+
+class Media(models.Model):
+    order = generic.GenericRelation(Order)
+
+class Photo(Media):
+    pass