mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-06 10:49:17 +00:00
Code Issues 32 Releases Wiki Activity

[soc2009/multidb] Fixed the method_set_order function that is used with the order_with_respect to option to work in a multidb environ

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11418 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor 2009-08-09 02:46:27 +00:00
parent b6ae173078
commit 2309288688
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -468,7 +468,6 @@ class Model(object):
manager = cls._base_manager manager = cls._base_manager
if pk_set: if pk_set:
# Determine whether a record with the primary key already exists. # Determine whether a record with the primary key already exists.
# FIXME work with the using parameter
if (force_update or (not force_insert and if (force_update or (not force_insert and
manager.using(using).filter(pk=pk_val).extra(select={'a': 1}).values('a').order_by())): manager.using(using).filter(pk=pk_val).extra(select={'a': 1}).values('a').order_by())):
# It does already exist, so do an UPDATE. # It does already exist, so do an UPDATE.
@ -619,15 +618,16 @@ class Model(object):
# ORDERING METHODS ######################### # ORDERING METHODS #########################
def method_set_order(ordered_obj, self, id_list): def method_set_order(ordered_obj, self, id_list, using=None):
if using is None:
using = DEFAULT_DB_ALIAS
rel_val = getattr(self, ordered_obj._meta.order_with_respect_to.rel.field_name) rel_val = getattr(self, ordered_obj._meta.order_with_respect_to.rel.field_name)
order_name = ordered_obj._meta.order_with_respect_to.name order_name = ordered_obj._meta.order_with_respect_to.name
# FIXME: It would be nice if there was an "update many" version of update # FIXME: It would be nice if there was an "update many" version of update
# for situations like this. # for situations like this.
for i, j in enumerate(id_list): for i, j in enumerate(id_list):
ordered_obj.objects.filter(**{'pk': j, order_name: rel_val}).update(_order=i) ordered_obj.objects.filter(**{'pk': j, order_name: rel_val}).update(_order=i)
# TODO transaction.commit_unless_managed(using=using)
transaction.commit_unless_managed(using=DEFAULT_DB_ALIAS)
def method_get_order(ordered_obj, self): def method_get_order(ordered_obj, self):