innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed the detection of when a custom manager is required because an 'objects' 

field already exists.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3131 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2006-06-15 14:05:33 +00:00
parent 28e643743f
commit 062bae3bb3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/db/models/manager.py
View File

@ -3,6 +3,7 @@ from django.db import backend, connection
from django.db.models.query import QuerySet from django.db.models.query import QuerySet
from django.dispatch import dispatcher from django.dispatch import dispatcher
from django.db.models import signals from django.db.models import signals
from django.db.models.fields import FieldDoesNotExist
from django.utils.datastructures import SortedDict from django.utils.datastructures import SortedDict
# Size of each "chunk" for get_iterator calls. # Size of each "chunk" for get_iterator calls.
@ -13,8 +14,11 @@ def ensure_default_manager(sender):
cls = sender cls = sender
if not hasattr(cls, '_default_manager'): if not hasattr(cls, '_default_manager'):
# Create the default manager, if needed. # Create the default manager, if needed.
if hasattr(cls, 'objects'): try:
raise ValueError, "Model %s must specify a custom Manager, because it has a field named 'objects'" % name cls._meta.get_field('objects')
raise ValueError, "Model %s must specify a custom Manager, because it has a field named 'objects'" % cls.__name__
except FieldDoesNotExist:
pass
cls.add_to_class('objects', Manager()) cls.add_to_class('objects', Manager())
dispatcher.connect(ensure_default_manager, signal=signals.class_prepared) dispatcher.connect(ensure_default_manager, signal=signals.class_prepared)