Fixed #40 -- Removed legacy code from meta.py method_set_related_many_to_many(). Thanks, jforeman@hark.org

git-svn-id: http://code.djangoproject.com/svn/django/trunk@157 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-07-17 17:27:34 +00:00
parent 6ae4def03b
commit 58df4ce636
1 changed files with 2 additions and 6 deletions

View File

@ -894,12 +894,8 @@ def method_set_related_many_to_many(rel_opts, rel_field, self, id_list):
this_id = getattr(self, self._meta.pk.name) this_id = getattr(self, self._meta.pk.name)
cursor = db.db.cursor() cursor = db.db.cursor()
cursor.execute("DELETE FROM %s WHERE %s_id = %%s" % (m2m_table, rel.object_name.lower()), [this_id]) cursor.execute("DELETE FROM %s WHERE %s_id = %%s" % (m2m_table, rel.object_name.lower()), [this_id])
if rel_field.rel.orderable: sql = "INSERT INTO %s (%s_id, %s_id) VALUES (%%s, %%s)" % (m2m_table, rel.object_name.lower(), rel_opts.object_name.lower())
sql = "INSERT INTO %s (%s_id, %s_id, _order) VALUES (%%s, %%s, %%s)" % (m2m_table, rel.object_name.lower(), rel_opts.object_name.lower()) cursor.executemany(sql, [(this_id, i) for i in id_list])
cursor.executemany(sql, [(this_id, j, i) for i, j in enumerate(id_list)])
else:
sql = "INSERT INTO %s (%s_id, %s_id) VALUES (%%s, %%s)" % (m2m_table, rel.object_name.lower(), rel_opts.object_name.lower())
cursor.executemany(sql, [(this_id, i) for i in id_list])
db.db.commit() db.db.commit()
# ORDERING METHODS ######################### # ORDERING METHODS #########################