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

magic-removal: Fixed bug with m2m 'add()' in the case where the objects were already added (fixes one test)

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2285 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Luke Plant 2006-02-06 22:16:15 +00:00
parent a91ebaa2c3
commit d03b2de326
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,10 @@ from django.core import validators
from django import forms from django import forms
from django.dispatch import dispatcher from django.dispatch import dispatcher
# For Python 2.3
if not hasattr(__builtins__, 'set'):
from sets import Set as set
# Values for Relation.edit_inline. # Values for Relation.edit_inline.
TABULAR, STACKED = 1, 2 TABULAR, STACKED = 1, 2
@ -114,13 +118,22 @@ def _add_m2m_items(rel_manager_inst, managerclass, rel_model, join_table, this_c
for obj in objs: for obj in objs:
if not isinstance(obj, rel_model): if not isinstance(obj, rel_model):
raise ValueError, "positional arguments to add() must be %s instances" % rel_opts.object_name raise ValueError, "positional arguments to add() must be %s instances" % rel_opts.object_name
# Add the newly created or already existing objects to the join table. # Add the newly created or already existing objects to the join table.
# TODO: Check to make sure the object isn't already in the join table. # First find out which items are already added, to avoid adding them twice
new_ids = set([obj._get_pk_val() for obj in objs])
cursor = connection.cursor() cursor = connection.cursor()
for obj in objs: rowcount = cursor.execute("SELECT %s FROM %s WHERE %s = %%s AND %s IN (%s)" % \
(rel_col_name, join_table, this_col_name,
rel_col_name, ",".join(['%s'] * len(new_ids))),
[this_pk_val] + list(new_ids))
existing_ids = set([row[0] for row in cursor.fetchmany(rowcount)])
# Add the ones that aren't there already
for obj_id in (new_ids - existing_ids):
cursor.execute("INSERT INTO %s (%s, %s) VALUES (%%s, %%s)" % \ cursor.execute("INSERT INTO %s (%s, %s) VALUES (%%s, %%s)" % \
(join_table, this_col_name, rel_col_name), (join_table, this_col_name, rel_col_name),
[this_pk_val, obj._get_pk_val()]) [this_pk_val, obj_id])
connection.commit() connection.commit()
def _remove_m2m_items(rel_model, join_table, this_col_name, def _remove_m2m_items(rel_model, join_table, this_col_name,