Fixed #20946 -- model inheritance + m2m failure

Cleaned up the internal implementation of m2m fields by removing
related.py _get_fk_val(). The _get_fk_val() was doing the wrong thing
if asked for the foreign key value on foreign key to parent model's
primary key when child model had different primary key field.

2 files changed, 21 insertions, 1 deletions

diff --git a/tests/model_inheritance/models.py b/tests/model_inheritance/models.py
index 106645d23c..020bb35bc7 100644
--- a/tests/model_inheritance/models.py
+++ b/tests/model_inheritance/models.py
@@ -162,3 +162,9 @@ class Mixin(object):
 
 class MixinModel(models.Model, Mixin):
     pass
+
+class Base(models.Model):
+    titles = models.ManyToManyField(Title)
+
+class SubBase(Base):
+    sub_id = models.IntegerField(primary_key=True)
diff --git a/tests/model_inheritance/tests.py b/tests/model_inheritance/tests.py
index b8ab0c8581..dab3088a41 100644
--- a/tests/model_inheritance/tests.py
+++ b/tests/model_inheritance/tests.py
@@ -10,7 +10,8 @@ from django.utils import six
 
 from .models import (
     Chef, CommonInfo, ItalianRestaurant, ParkingLot, Place, Post,
-    Restaurant, Student, StudentWorker, Supplier, Worker, MixinModel)
+    Restaurant, Student, StudentWorker, Supplier, Worker, MixinModel,
+    Title, Base, SubBase)
 
 
 class ModelInheritanceTests(TestCase):
@@ -357,3 +358,16 @@ class ModelInheritanceTests(TestCase):
             [Place.objects.get(pk=s.pk)],
             lambda x: x
         )
+
+    def test_custompk_m2m(self):
+        b = Base.objects.create()
+        b.titles.add(Title.objects.create(title="foof"))
+        s = SubBase.objects.create(sub_id=b.id)
+        b = Base.objects.get(pk=s.id)
+        self.assertNotEqual(b.pk, s.pk)
+        # Low-level test for related_val
+        self.assertEqual(s.titles.related_val, (s.id,))
+        # Higher level test for correct query values (title foof not
+        # accidentally found).
+        self.assertQuerysetEqual(
+            s.titles.all(), [])