Ticket #11560: multiple_proxy_models.diff

docs/topics/db/models.txt

@@ -1104 +1104 @@
 proxy model can inherit from any number of abstract model classes, providing
 they do *not* define any model fields.
 
+A proxy model can also inherit from any number of proxy model classes, as
+long as they all share a common non-abstract parent class.
+
 Proxy models inherit any ``Meta`` options that they don't define from their
 non-abstract model parent (the model they are proxying for).
 

django/db/models/base.py

@@ -111 +111 @@
                         raise TypeError("Abstract base class containing model fields not permitted for proxy model '%s'." % name)
                     else:
                         continue
-                if base is not None:
+                while parent._meta.proxy:
+                    parent = parent._meta.proxy_for_model
+                if base is not None and base is not parent:
                     raise TypeError("Proxy model '%s' has more than one non-abstract model base class." % name)
                 else:
                     base = parent

tests/modeltests/proxy_models/tests.py

@@ -10 +10 @@
 from models import MyPersonProxy, Abstract, OtherPerson, User, UserProxy
 from models import UserProxyProxy, Country, State, StateProxy, TrackerUser
 from models import BaseUser, Bug, ProxyTrackerUser, Improvement, ProxyProxyBug
-from models import ProxyBug, ProxyImprovement
+from models import ProxyBug, ProxyImprovement, RepeatedUserProxy
 
 class ProxyModelTests(TestCase):
     def test_same_manager_queries(self):
@@ -231 +231 @@
         resp = [u.name for u in UserProxyProxy.objects.all()]
         self.assertEqual(resp, ['Bruce'])
 
+    def test_user_repeateduserproxy(self):
+        User.objects.create(name='Bruce')
+
+        resp = [u.name for u in User.objects.all()]
+        self.assertEqual(resp, ['Bruce'])
+
+        resp = [u.name for u in UserProxy.objects.all()]
+        self.assertEqual(resp, ['Bruce'])
+
+        resp = [u.name for u in RepeatedUserProxy.objects.all()]
+        self.assertEqual(resp, ['Bruce'])
+
     def test_proxy_delete(self):
         """
         Proxy objects can be deleted

tests/modeltests/proxy_models/models.py

@@ -96 +96 @@
     class Meta:
         proxy = True
 
+class AnotherUserProxy(User):
+    class Meta:
+        proxy = True
+
+class RepeatedUserProxy(UserProxy,AnotherUserProxy):
+    class Meta:
+        proxy = True
+
 # We can still use `select_related()` to include related models in our querysets.
 class Country(models.Model):
     name = models.CharField(max_length=50)
@@ -161 +169 @@
 
 class ProxyImprovement(Improvement):
     class Meta:
-        proxy = True
- No newline at end of file
+        proxy = True