Merge pull request #118 from theatlantic/_default_manager-instance-fix

Set _default_manager directly on model_cls; don't use add_to_class()
jazzband · Apr 8, 2015 · d16d989 · d16d989
2 parents 7edafcf + a3d9379
commit d16d989
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/polymorphic/base.py b/polymorphic/base.py
@@ -77,15 +77,17 @@ def __new__(self, model_name, bases, attrs):
         for source_name, mgr_name, manager in inherited_managers:
             #print '** add inherited manager from model %s, manager %s, %s' % (source_name, mgr_name, manager.__class__.__name__)
             new_manager = manager._copy_to_model(new_class)
-            new_class.add_to_class(mgr_name, new_manager)
+            if mgr_name == '_default_manager':
+                new_class._default_manager = new_manager
+            else:
+                new_class.add_to_class(mgr_name, new_manager)
 
         # get first user defined manager; if there is one, make it the _default_manager
         # this value is used by the related objects, restoring access to custom queryset methods on related objects.
         user_manager = self.get_first_user_defined_manager(new_class)
         if user_manager:
-            def_mgr = user_manager._copy_to_model(new_class)
             #print '## add default manager', type(def_mgr)
-            new_class.add_to_class('_default_manager', def_mgr)
+            new_class._default_manager = user_manager._copy_to_model(new_class)
             new_class._default_manager._inherited = False   # the default mgr was defined by the user, not inherited
 
         # validate resulting default manager

diff --git a/polymorphic/tests.py b/polymorphic/tests.py
@@ -506,6 +506,29 @@ def show_base_manager(model):
         self.assertEqual(show_base_manager(One2OneRelatingModelDerived), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.One2OneRelatingModelDerived'>")
 
 
+    def test_instance_default_manager(self):
+        def show_default_manager(instance):
+            return "{0} {1}".format(
+                repr(type(instance._default_manager)),
+                repr(instance._default_manager.model)
+            )
+
+        plain_a = PlainA(field1='C1')
+        plain_b = PlainB(field2='C1')
+        plain_c = PlainC(field3='C1')
+
+        model_2a = Model2A(field1='C1')
+        model_2b = Model2B(field2='C1')
+        model_2c = Model2C(field3='C1')
+
+        self.assertEqual(show_default_manager(plain_a), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.PlainA'>")
+        self.assertEqual(show_default_manager(plain_b), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.PlainB'>")
+        self.assertEqual(show_default_manager(plain_c), "<class 'django.db.models.manager.Manager'> <class 'polymorphic.tests.PlainC'>")
+
+        self.assertEqual(show_default_manager(model_2a), "<class 'polymorphic.manager.PolymorphicManager'> <class 'polymorphic.tests.Model2A'>")
+        self.assertEqual(show_default_manager(model_2b), "<class 'polymorphic.manager.PolymorphicManager'> <class 'polymorphic.tests.Model2B'>")
+        self.assertEqual(show_default_manager(model_2c), "<class 'polymorphic.manager.PolymorphicManager'> <class 'polymorphic.tests.Model2C'>")
+
     def test_foreignkey_field(self):
         self.create_model2abcd()