Catch error if throw_on_exists flag is False for document create

Author: smithsz

src/cloudant/database.py

@@ -157,10 +157,15 @@ def create_document(self, data, throw_on_exists=False):
             doc = DesignDocument(self, docid)
         else:
             doc = Document(self, docid)
-        if throw_on_exists and doc.exists():
-            raise CloudantDatabaseException(409, docid)
         doc.update(data)
-        doc.create()
+        try:
+            doc.create()
+        except HTTPError as error:
+            if error.response.status_code == 409:
+                if throw_on_exists:
+                    raise CloudantDatabaseException(409, docid)
+            else:
+                raise
         super(CouchDatabase, self).__setitem__(doc['_id'], doc)
         return doc
 

tests/unit/database_tests.py

@@ -267,6 +267,17 @@ def test_create_document_with_id(self):
                 'Document with id julia06 already exists.'
                 )
 
+    def test_create_document_that_already_exists(self):
+        """
+        Test creating a document that already exists
+        """
+        data = {'_id': 'julia'}
+        doc = self.db.create_document(data)
+        self.assertEqual(self.db['julia'], doc)
+        self.assertTrue(doc['_rev'].startswith('1-'))
+        # attempt to recreate document
+        self.db.create_document(data, throw_on_exists=False)
+
     def test_create_document_without_id(self):
         """
         Test creating a document without supplying a document id