Ticket #8825: 8825.diff

django/db/models/base.py

@@ -90 +90 @@
                 
             # All the fields of any type declared on this model
             new_fields = new_class._meta.local_fields + \
-                         new_class._meta.many_to_many + \
+                         new_class._meta.local_many_to_many + \
                          new_class._meta.virtual_fields
             field_names = set([f.name for f in new_fields])
                 

tests/regressiontests/model_inheritance_regress/models.py

@@ -71 +71 @@
 class ArticleWithAuthor(Article):
     author = models.CharField(max_length=100) 
 
+class M2MBase(models.Model):
+    articles = models.ManyToManyField(Article)
+
+class M2MChild(M2MBase):
+    name = models.CharField(max_length=50)
+
 __test__ = {'API_TESTS':"""
 # Regression for #7350, #7202
 # Check that when you create a Parent object with a specific reference to an
@@ -231 +237 @@
     ...
 DoesNotExist: ArticleWithAuthor matching query does not exist.
 
+# Regression test for #8825
+# Verify that ManyToManyField is still present in a child model.
+
+>>> len(M2MChild._meta.many_to_many)
+1
+
 """}