Changeset 2047

Timestamp:

01/18/06 07:16:58 (3 years ago)

Author:

russellm

Message:

magic-removal: Refs 1219 -- Added DELETE_ALL=True safety mechanism to prevent accidental deletion of entire table contents.

Files:

• django/branches/magic-removal/django/db/models/manager.py (modified) (3 diffs)
• django/branches/magic-removal/tests/modeltests/basic/models.py (modified) (1 diff)

django/branches/magic-removal/django/db/models/manager.py

@@ -101 +101 @@
-        # Check if extra tables are allowed. If not, throw an error
-        if (tables or joins) and not allow_joins:
-("Joins are not allowed in this type of query")
+, "Joins are not allowed in this type of query"
-
-        # Compose the join dictionary into SQL describing the joins.
@@ -151 +151 @@
-
-    def delete(self, *args, **kwargs):
+        nArguments = len(args) + len(kwargs)
+
+        # remove the DELETE_ALL argument, if it exists 
+        delete_all = kwargs.pop('DELETE_ALL', False)
+
-        # disable non-supported fields
-        kwargs['select_related'] = False
@@ -158 +163 @@
-        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
-

django/branches/magic-removal/tests/modeltests/basic/models.py

@@ -211 +211 @@
-4L
-
+>>> Article.objects.delete()
+Traceback (most recent call last):
+    ...
+TypeError: SAFTEY MECHANISM: Specify DELETE_ALL=True if you actually want to delete all data
+
+>>> Article.objects.delete(DELETE_ALL=True)
+>>> Article.objects.get_count()
+0L
+
-"""
-