Merge pull request #288 from cloudant/287-throw-412-when-db-already-exists

287 throw exception with 412 code when db exists

Author: emlaver

CHANGES.rst

@@ -1,6 +1,7 @@
 2.5.0 (Unreleased)
 ==================
 - [FIXED] Fixed ``TypeError`` when setting revision limits on Python>=3.6.
+- [FIXED] Fixed Cloudant exception code 409 with 412 when creating a database that already exists.
 
 2.4.0 (2017-02-14)
 ==================

src/cloudant/_messages.py

@@ -73,15 +73,16 @@
     101: 'Value must be set to a Database object. Found type: {0}',
     102: 'You must provide a url or an account.',
     404: 'Database {0} does not exist. Verify that the client is valid and try again.',
-    409: 'Database {0} already exists.'
+    412: 'Database {0} already exists.'
 }
 
 DATABASE = {
     100: 'A general Cloudant database exception was raised.',
     101: 'Unexpected index type. Found: {0}',
     400: 'Invalid database name during creation. Found: {0}',
     401: 'Unauthorized to create database {0}',
-    409: 'Document with id {0} already exists.'
+    409: 'Document with id {0} already exists.',
+    412: 'Database {0} already exists.'
 }
 
 DESIGN_DOCUMENT = {

src/cloudant/client.py

@@ -226,7 +226,7 @@ def create_database(self, dbname, **kwargs):
         new_db = self._DATABASE_CLASS(self, dbname)
         if new_db.exists():
             if kwargs.get('throw_on_exists', True):
-                raise CloudantClientException(409, dbname)
+                raise CloudantClientException(412, dbname)
         new_db.create()
         super(CouchDB, self).__setitem__(dbname, new_db)
         return new_db

tests/unit/client_tests.py

@@ -277,7 +277,7 @@ def test_create_existing_database(self):
         self.client.create_database(dbname)
         with self.assertRaises(CloudantClientException) as cm:
             self.client.create_database(dbname, throw_on_exists=True)
-        self.assertEqual(cm.exception.status_code, 409)
+        self.assertEqual(cm.exception.status_code, 412)
 
         self.client.delete_database(dbname)
         self.client.disconnect()