Ticket #12664: generic_relation_pk_fix.1.diff

django/contrib/contenttypes/generic.py

@@ -129 +129 @@
         return self.object_id_field_name
 
     def m2m_reverse_name(self):
-        return self.model._meta.pk.column
+        return self.rel.to._meta.pk.column
 
     def contribute_to_class(self, cls, name):
         super(GenericRelation, self).contribute_to_class(cls, name)

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, Person, Address
 
 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_reverse_relation_pk(self):
+        """
+        Test that the correct column name for the primary key is used on the
+        originating model during a query.
+        """
+        p = Person.objects.create(account=23, name='Chef')
+        a = Address.objects.create(street='123 Anywhere Place',
+                                   city='Conifer', state='CO',
+                                   zipcode='80433', content_object=p)
+        
+        qs = Person.objects.filter(addresses__zipcode='80433')
+        self.assertEqual(1, qs.count())
+        self.assertEqual('Chef', qs[0].name)

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 Address(models.Model):
+    street = models.CharField(max_length=80)
+    city = models.CharField(max_length=50)
+    state = models.CharField(max_length=2)
+    zipcode = models.CharField(max_length=5)
+    content_type = models.ForeignKey(ContentType)
+    object_id = models.PositiveIntegerField()
+    content_object = generic.GenericForeignKey()
+
+    def __unicode__(self):
+        return '%s %s, %s %s' % (self.street, self.city, self.state, self.zipcode)
+
+class Person(models.Model):
+    account = models.IntegerField(primary_key=True)
+    name = models.CharField(max_length=128)
+    addresses = generic.GenericRelation(Address)
+
+    def __unicode__(self):
+        return self.name