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

Undo bad fix for #684

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Robert Wittams 2005-10-02 18:08:01 +00:00
parent cfe2e95529
commit 1c9cf48651
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/core/meta/__init__.py
View File

@ -1035,10 +1035,9 @@ def method_set_related_many_to_many(rel_opts, rel_field, self, id_list):
m2m_table = rel_field.get_m2m_db_table(rel_opts) m2m_table = rel_field.get_m2m_db_table(rel_opts)
this_id = getattr(self, self._meta.pk.column) this_id = getattr(self, self._meta.pk.column)
cursor = db.db.cursor() cursor = db.db.cursor()
delete_stmt = "DELETE FROM %s WHERE %s_id = %%s" % (m2m_table, rel.object_name.lower()) cursor.execute("DELETE FROM %s WHERE %s_id = %%s" % (m2m_table, rel.object_name.lower()), [this_id])
cursor.execute(delete_stmt, [this_id]) sql = "INSERT INTO %s (%s_id, %s_id) VALUES (%%s, %%s)" % (m2m_table, rel.object_name.lower(), rel_opts.object_name.lower())
insert_stmt = "INSERT INTO %s (%s, %s) VALUES (%%s, %%s)" % (m2m_table, rel.pk.column, rel_opts.pk.column) cursor.executemany(sql, [(this_id, i) for i in id_list])
cursor.executemany(insert_stmt, [(this_id, i) for i in id_list])
db.db.commit() db.db.commit()
# ORDERING METHODS ######################### # ORDERING METHODS #########################
@ -1489,7 +1488,7 @@ def get_manipulator(opts, klass, extra_methods, add=False, change=False):
setattr(man, k, v) setattr(man, k, v)
return man return man
def manipulator_init(opts, add, change, self, obj_key=None, follow=None): def manipulator_init(opts, add, change, self, obj_key=None):
if change: if change:
assert obj_key is not None, "ChangeManipulator.__init__() must be passed obj_key parameter." assert obj_key is not None, "ChangeManipulator.__init__() must be passed obj_key parameter."
self.obj_key = obj_key self.obj_key = obj_key