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

magic-removal: Changed delete() safety-mechanism logic to happen as soon as possible.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2107 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-01-23 02:34:07 +00:00
parent 25e1e1392f
commit 69120fa9d3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/db/models/manager.py
View File

@ -150,11 +150,15 @@ class Manager(object):
return select, " ".join(sql), params return select, " ".join(sql), params
def delete(self, *args, **kwargs): def delete(self, *args, **kwargs):
nArguments = len(args) + len(kwargs) num_args = len(args) + len(kwargs)
# remove the DELETE_ALL argument, if it exists # Remove the DELETE_ALL argument, if it exists.
delete_all = kwargs.pop('DELETE_ALL', False) delete_all = kwargs.pop('DELETE_ALL', False)
# Check for at least one query argument.
if num_args == 0 and not delete_all:
raise TypeError, "SAFETY MECHANISM: Specify DELETE_ALL=True if you actually want to delete all data."
# disable non-supported fields # disable non-supported fields
kwargs['select_related'] = False kwargs['select_related'] = False
kwargs['select'] = {} kwargs['select'] = {}
@ -162,10 +166,6 @@ class Manager(object):
kwargs['offset'] = None kwargs['offset'] = None
kwargs['limit'] = None kwargs['limit'] = None
# Check that there at least one query argument
if nArguments == 0 and not delete_all:
raise TypeError, "SAFTEY MECHANISM: Specify DELETE_ALL=True if you actually want to delete all data"
opts = self.klass._meta opts = self.klass._meta
# Perform the SQL delete # Perform the SQL delete

2
tests/modeltests/basic/models.py
View File

@ -213,7 +213,7 @@ AttributeError: Manager isn't accessible via Article instances
>>> Article.objects.delete() >>> Article.objects.delete()
Traceback (most recent call last): Traceback (most recent call last):
... ...
TypeError: SAFTEY MECHANISM: Specify DELETE_ALL=True if you actually want to delete all data TypeError: SAFETY MECHANISM: Specify DELETE_ALL=True if you actually want to delete all data.
>>> Article.objects.delete(DELETE_ALL=True) >>> Article.objects.delete(DELETE_ALL=True)
>>> Article.objects.get_count() >>> Article.objects.get_count()