Prevent document deletion from deleting database (issue 123).

djc · djc · commit f6b40bbb480c · 2010-04-10T17:59:08.000+02:00
diff --git a/couchdb/client.py b/couchdb/client.py
@@ -449,6 +449,8 @@ def delete(self, doc):
         :raise ResourceConflict: if the document was updated in the database
         :since: 0.4.1
         """
+        if doc['_id'] is None:
+            raise ValueError('document ID cannot be None')
         self.resource.delete_json(doc['_id'], rev=doc['_rev'])
 
     def get(self, id, default=None, **options):
diff --git a/couchdb/tests/client.py b/couchdb/tests/client.py
@@ -176,6 +176,10 @@ def test_disallow_nan(self):
         except ValueError:
             pass
 
+    def test_disallow_none_id(self):
+        deldoc = lambda: self.db.delete({'_id': None, '_rev': None})
+        self.assertRaises(ValueError, deldoc)
+
     def test_doc_revs(self):
         doc = {'bar': 42}
         self.db['foo'] = doc
