test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed problem with assiging an empty list to m2m related descriptors, introduced in [4231]. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4232 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2006-12-20 13:57:17 +00:00
parent 2d6095ea5e
commit e859f108f1
2 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,25 +317,27 @@ def create_many_related_manager(superclass):
# *objs - objects to add # *objs - objects to add
from django.db import connection from django.db import connection
# Add the newly created or already existing objects to the join table. # If there aren't any objects, there is nothing to do.
# First find out which items are already added, to avoid adding them twice if objs:
new_ids = set([obj._get_pk_val() for obj in objs]) # Add the newly created or already existing objects to the join table.
cursor = connection.cursor() # First find out which items are already added, to avoid adding them twice
cursor.execute("SELECT %s FROM %s WHERE %s = %%s AND %s IN (%s)" % \ new_ids = set([obj._get_pk_val() for obj in objs])
(target_col_name, self.join_table, source_col_name, cursor = connection.cursor()
target_col_name, ",".join(['%s'] * len(new_ids))), cursor.execute("SELECT %s FROM %s WHERE %s = %%s AND %s IN (%s)" % \
[self._pk_val] + list(new_ids)) (target_col_name, self.join_table, source_col_name,
if cursor.rowcount is not None and cursor.rowcount != 0: target_col_name, ",".join(['%s'] * len(new_ids))),
existing_ids = set([row[0] for row in cursor.fetchmany(cursor.rowcount)]) [self._pk_val] + list(new_ids))
else: if cursor.rowcount is not None and cursor.rowcount != 0:
existing_ids = set() existing_ids = set([row[0] for row in cursor.fetchmany(cursor.rowcount)])
else:
existing_ids = set()
# Add the ones that aren't there already # Add the ones that aren't there already
for obj_id in (new_ids - existing_ids): 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)" % \
(self.join_table, source_col_name, target_col_name), (self.join_table, source_col_name, target_col_name),
[self._pk_val, obj_id]) [self._pk_val, obj_id])
transaction.commit_unless_managed() transaction.commit_unless_managed()
def _remove_items(self, source_col_name, target_col_name, *objs): def _remove_items(self, source_col_name, target_col_name, *objs):
# source_col_name: the PK colname in join_table for the source object # source_col_name: the PK colname in join_table for the source object

12
tests/modeltests/many_to_many/models.py
View File

@ -231,4 +231,16 @@ __test__ = {'API_TESTS':"""
>>> p1.article_set.all() >>> p1.article_set.all()
[<Article: NASA uses Python>] [<Article: NASA uses Python>]
# An alternate to calling clear() is to assign the empty set
>>> p1.article_set = []
>>> p1.article_set.all()
[]
>>> a2.publications = [p1, new_publication]
>>> a2.publications.all()
[<Publication: Highlights for Children>, <Publication: The Python Journal>]
>>> a2.publications = []
>>> a2.publications.all()
[]
"""} """}