diff options
Diffstat (limited to 'django/db/models')
| -rw-r--r-- | django/db/models/base.py | 12 | ||||
| -rw-r--r-- | django/db/models/fields/related.py | 44 |
2 files changed, 39 insertions, 17 deletions
diff --git a/django/db/models/base.py b/django/db/models/base.py index dec0316947..34b31b89af 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -437,7 +437,17 @@ class Model(object): else: sub_obj._collect_sub_objects(seen_objs, self.__class__, related.field.null) else: - for sub_obj in getattr(self, rel_opts_name).all(): + # To make sure we can access all elements, we can't use the + # normal manager on the related object. So we work directly + # with the descriptor object. + for cls in self.__class__.mro(): + if rel_opts_name in cls.__dict__: + rel_descriptor = cls.__dict__[rel_opts_name] + break + else: + raise AssertionError("Should never get here.") + delete_qs = rel_descriptor.delete_manager(self).all() + for sub_obj in delete_qs: sub_obj._collect_sub_objects(seen_objs, self.__class__, related.field.null) # Handle any ancestors (for the model-inheritance case). We do this by diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index 146a1ae457..8eab18b0c2 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -181,7 +181,7 @@ class SingleRelatedObjectDescriptor(object): return getattr(instance, self.cache_name) except AttributeError: params = {'%s__pk' % self.related.field.name: instance._get_pk_val()} - rel_obj = self.related.model._default_manager.get(**params) + rel_obj = self.related.model._base_manager.get(**params) setattr(instance, self.cache_name, rel_obj) return rel_obj @@ -289,13 +289,36 @@ class ForeignRelatedObjectsDescriptor(object): if instance is None: return self + return self.create_manager(instance, + self.related.model._default_manager.__class__) + + def __set__(self, instance, value): + if instance is None: + raise AttributeError, "Manager must be accessed via instance" + + manager = self.__get__(instance) + # If the foreign key can support nulls, then completely clear the related set. + # Otherwise, just move the named objects into the set. + if self.related.field.null: + manager.clear() + manager.add(*value) + + def delete_manager(self, instance): + """ + Returns a queryset based on the related model's base manager (rather + than the default manager, as returned by __get__). Used by + Model.delete(). + """ + return self.create_manager(instance, + self.related.model._base_manager.__class__) + + def create_manager(self, instance, superclass): + """ + Creates the managers used by other methods (__get__() and delete()). + """ rel_field = self.related.field rel_model = self.related.model - # Dynamically create a class that subclasses the related - # model's default manager. - superclass = self.related.model._default_manager.__class__ - class RelatedManager(superclass): def get_query_set(self): return superclass.get_query_set(self).filter(**(self.core_filters)) @@ -345,17 +368,6 @@ class ForeignRelatedObjectsDescriptor(object): return manager - def __set__(self, instance, value): - if instance is None: - raise AttributeError, "Manager must be accessed via instance" - - manager = self.__get__(instance) - # If the foreign key can support nulls, then completely clear the related set. - # Otherwise, just move the named objects into the set. - if self.related.field.null: - manager.clear() - manager.add(*value) - def create_many_related_manager(superclass, through=False): """Creates a manager that subclasses 'superclass' (which is a Manager) and adds behavior for many-to-many related objects.""" |