From 20b46983a71825f6fa86d8db5fe9875d8cbc0840 Mon Sep 17 00:00:00 2001 From: Sebastian Noack Date: Fri, 2 May 2008 13:22:20 +0200 Subject: [PATCH] Now all managers, not only the default manager gets copied to the derived model of an abstract model (#7154). --- django/db/models/base.py | 14 +++++--------- django/db/models/manager.py | 22 +++++++--------------- django/db/models/options.py | 1 + 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/django/db/models/base.py b/django/db/models/base.py index 181d845..24208f4 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -65,12 +65,6 @@ class ModelBase(type): if not hasattr(meta, 'get_latest_by'): new_class._meta.get_latest_by = base_meta.get_latest_by - old_default_mgr = None - if getattr(new_class, '_default_manager', None): - # We have a parent who set the default manager. - if new_class._default_manager.model._meta.abstract: - old_default_mgr = new_class._default_manager - new_class._default_manager = None if getattr(new_class._meta, 'app_label', None) is None: # Figure out the app_label by looking one level up. # For 'django.contrib.sites.models', this would be 'sites'. @@ -106,7 +100,7 @@ class ModelBase(type): new_class.add_to_class(attr_name, field) new_class._meta.parents[base] = field else: - # The abstract base class case. + # Copy fields from the abstract base class. names = set([f.name for f in new_class._meta.local_fields + new_class._meta.many_to_many]) for field in base._meta.local_fields + base._meta.local_many_to_many: if field.name in names: @@ -114,6 +108,10 @@ class ModelBase(type): % (field.name, name, base.__name__)) new_class.add_to_class(field.name, copy.deepcopy(field)) + # Copy managers from the abstract base class. + for mgr_attr, mgr in base._meta.base_managers.iteritems(): + new_class.add_to_class(mgr_attr, copy.copy(mgr)) + if abstract: # Abstract base models can't be instantiated and don't appear in # the list of models for an app. We do the final setup for them a @@ -122,8 +120,6 @@ class ModelBase(type): new_class.Meta = attr_meta return new_class - if old_default_mgr and not new_class._default_manager: - new_class._default_manager = old_default_mgr._copy_to_model(new_class) new_class._prepare() register_models(new_class._meta.app_label, new_class) diff --git a/django/db/models/manager.py b/django/db/models/manager.py index 3a9da34..5f0872e 100644 --- a/django/db/models/manager.py +++ b/django/db/models/manager.py @@ -31,21 +31,13 @@ class Manager(object): def contribute_to_class(self, model, name): # TODO: Use weakref because of possible memory leak / circular reference. - self.model = model - setattr(model, name, ManagerDescriptor(self)) - if not getattr(model, '_default_manager', None) or self.creation_counter < model._default_manager.creation_counter: - model._default_manager = self - - def _copy_to_model(self, model): - """ - Makes a copy of the manager and assigns it to 'model', which should be - a child of the existing model (used when inheriting a manager from an - abstract base class). - """ - assert issubclass(model, self.model) - mgr = copy.copy(self) - mgr.model = model - return mgr + if not model._meta.abstract: + self.model = model + setattr(model, name, ManagerDescriptor(self)) + if not getattr(model, '_default_manager', None) or self.creation_counter < model._default_manager.creation_counter: + model._default_manager = self + else: + model._meta.base_managers[name] = self ####################### # PROXIES TO QUERYSET # diff --git a/django/db/models/options.py b/django/db/models/options.py index 5802ead..d1feed9 100644 --- a/django/db/models/options.py +++ b/django/db/models/options.py @@ -44,6 +44,7 @@ class Options(object): self.one_to_one_field = None self.abstract = False self.parents = SortedDict() + self.base_managers = SortedDict() def contribute_to_class(self, cls, name): cls._meta = self -- 1.5.3.7