mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 18:29:11 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: Fixed #1598 -- Removed some references to get_object()

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-04-10 00:24:48 +00:00
parent 8d9ebc6609
commit 74be995014
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
django/db/models/base.py
View File

@ -277,13 +277,12 @@ class Model(object):
if not hasattr(self, cachename): if not hasattr(self, cachename):
op = is_next and '>' or '<' op = is_next and '>' or '<'
order_field = self.order_with_respect_to order_field = self.order_with_respect_to
obj = self._default_manager.get_object(order_by=('_order',), where = ['%s %s (SELECT %s FROM %s WHERE %s=%%s)' % \
where=['%s %s (SELECT %s FROM %s WHERE %s=%%s)' % \ (backend.quote_name('_order'), op, backend.quote_name('_order'),
(backend.quote_name('_order'), op, backend.quote_name('_order'), backend.quote_name(opts.db_table), backend.quote_name(opts.pk.column)),
backend.quote_name(opts.db_table), backend.quote_name(opts.pk.column)), '%s=%%s' % backend.quote_name(order_field.column)]
'%s=%%s' % backend.quote_name(order_field.column)], params = [self._get_pk_val(), getattr(self, order_field.attname)]
limit=1, obj = self._default_manager.order_by('_order').extra(where=where, params=params)[:1].get()
params=[self._get_pk_val(), getattr(self, order_field.attname)])
setattr(self, cachename, obj) setattr(self, cachename, obj)
return getattr(self, cachename) return getattr(self, cachename)

4
django/db/models/fields/related.py
View File

@ -38,7 +38,7 @@ def manipulator_valid_rel_key(f, self, field_data, all_data):
"Validates that the value is a valid foreign key" "Validates that the value is a valid foreign key"
klass = f.rel.to klass = f.rel.to
try: try:
klass._default_manager.get_object(pk=field_data) klass._default_manager.get(pk=field_data)
except klass.DoesNotExist: except klass.DoesNotExist:
raise validators.ValidationError, _("Please enter a valid %s.") % f.verbose_name raise validators.ValidationError, _("Please enter a valid %s.") % f.verbose_name
@ -392,7 +392,7 @@ class ReverseManyRelatedObjectsDescriptor(object):
rel_model=self.field.rel.to rel_model=self.field.rel.to
superclass = rel_model._default_manager.__class__ superclass = rel_model._default_manager.__class__
RelatedManager = create_many_related_manager(superclass) RelatedManager = create_many_related_manager(superclass)
qn = backend.quote_name qn = backend.quote_name
manager = RelatedManager( manager = RelatedManager(
model=rel_model, model=rel_model,

2
django/db/models/manipulators.py
View File

@ -263,7 +263,7 @@ class AutomaticChangeManipulator(AutomaticManipulator):
# Let the ObjectDoesNotExist exception propogate up. # Let the ObjectDoesNotExist exception propogate up.
lookup_kwargs = self.opts.one_to_one_field.rel.limit_choices_to lookup_kwargs = self.opts.one_to_one_field.rel.limit_choices_to
lookup_kwargs['%s__exact' % self.opts.one_to_one_field.rel.field_name] = obj_key lookup_kwargs['%s__exact' % self.opts.one_to_one_field.rel.field_name] = obj_key
_ = self.opts.one_to_one_field.rel.to.get_model_module().get_object(**lookup_kwargs) self.opts.one_to_one_field.rel.to.get_model_module().get(**lookup_kwargs)
params = dict([(f.attname, f.get_default()) for f in self.opts.fields]) params = dict([(f.attname, f.get_default()) for f in self.opts.fields])
params[self.opts.pk.attname] = obj_key params[self.opts.pk.attname] = obj_key
self.original_object = self.opts.get_model_module().Klass(**params) self.original_object = self.opts.get_model_module().Klass(**params)