Django

Code

Ticket #7154: 0002-Now-all-managers-not-only-the-default-manager-gets.patch

File 0002-Now-all-managers-not-only-the-default-manager-gets.patch, 4.6 kB (added by sebastian_noack, 7 months ago)

  • a/django/db/models/base.py

    old new  
    6565                if not hasattr(meta, 'get_latest_by'): 
    6666                    new_class._meta.get_latest_by = base_meta.get_latest_by 
    6767 
    68         old_default_mgr = None 
    69         if getattr(new_class, '_default_manager', None): 
    70             # We have a parent who set the default manager. 
    71             if new_class._default_manager.model._meta.abstract: 
    72                 old_default_mgr = new_class._default_manager 
    73             new_class._default_manager = None 
    7468        if getattr(new_class._meta, 'app_label', None) is None: 
    7569            # Figure out the app_label by looking one level up. 
    7670            # For 'django.contrib.sites.models', this would be 'sites'. 
    …… 
    106100                    new_class.add_to_class(attr_name, field) 
    107101                new_class._meta.parents[base] = field 
    108102            else: 
    109                 # The abstract base class case. 
     103                # Copy fields from the abstract base class. 
    110104                names = set([f.name for f in new_class._meta.local_fields + new_class._meta.many_to_many]) 
    111105                for field in base._meta.local_fields + base._meta.local_many_to_many: 
    112106                    if field.name in names: 
    …… 
    114108                                % (field.name, name, base.__name__)) 
    115109                    new_class.add_to_class(field.name, copy.deepcopy(field)) 
    116110 
     111                # Copy managers from the abstract base class. 
     112                for mgr_attr, mgr in base._meta.base_managers.iteritems(): 
     113                    new_class.add_to_class(mgr_attr, copy.copy(mgr)) 
     114 
    117115        if abstract: 
    118116            # Abstract base models can't be instantiated and don't appear in 
    119117            # the list of models for an app. We do the final setup for them a 
    …… 
    122120            new_class.Meta = attr_meta 
    123121            return new_class 
    124122 
    125         if old_default_mgr and not new_class._default_manager: 
    126             new_class._default_manager = old_default_mgr._copy_to_model(new_class) 
    127123        new_class._prepare() 
    128124        register_models(new_class._meta.app_label, new_class) 
    129125 

  • a/django/db/models/manager.py

    old new  
    3131 
    3232    def contribute_to_class(self, model, name): 
    3333        # TODO: Use weakref because of possible memory leak / circular reference. 
    34         self.model = model 
    35         setattr(model, name, ManagerDescriptor(self)) 
    36         if not getattr(model, '_default_manager', None) or self.creation_counter < model._default_manager.creation_counter: 
    37             model._default_manager = self 
    38  
    39     def _copy_to_model(self, model): 
    40         """ 
    41         Makes a copy of the manager and assigns it to 'model', which should be 
    42         a child of the existing model (used when inheriting a manager from an 
    43         abstract base class). 
    44         """ 
    45         assert issubclass(model, self.model) 
    46         mgr = copy.copy(self) 
    47         mgr.model = model 
    48         return mgr 
     34        if not model._meta.abstract: 
     35            self.model = model 
     36            setattr(model, name, ManagerDescriptor(self)) 
     37            if not getattr(model, '_default_manager', None) or self.creation_counter < model._default_manager.creation_counter: 
     38                model._default_manager = self 
     39        else: 
     40            model._meta.base_managers[name] = self 
    4941 
    5042    ####################### 
    5143    # PROXIES TO QUERYSET # 

  • a/django/db/models/options.py

    old new  
    4444        self.one_to_one_field = None 
    4545        self.abstract = False 
    4646        self.parents = SortedDict() 
     47        self.base_managers = SortedDict() 
    4748 
    4849    def contribute_to_class(self, cls, name): 
    4950        cls._meta = self