re-raise if set_autocommit fails

Author: altairbow

dj_db_conn_pool/backends/jdbc/__init__.py

@@ -12,12 +12,8 @@
 
 
 class JDBCDatabaseWrapper(PooledDatabaseWrapperMixin):
-    def _set_autocommit(self, autocommit):
-        with self.wrap_database_errors:
-            try:
-                self.connection.connection.jconn.setAutoCommit(autocommit)
-            except (Exception, ) as e:
-                logger.exception('unable to set database(%s) autocommit: %s', self.alias, e)
+    def _set_dbapi_autocommit(self, autocommit):
+        self.connection.connection.jconn.setAutoCommit(autocommit)
 
     @property
     def jdbc_driver(self):

dj_db_conn_pool/backends/mysql/base.py

@@ -12,9 +12,5 @@ class DatabaseWrapper(PooledDatabaseWrapperMixin, base.DatabaseWrapper):
     class SQLAlchemyDialect(MySQLDialect_pymysql):
         server_version_info = (0, )
 
-    def _set_autocommit(self, autocommit):
-        with self.wrap_database_errors:
-            try:
-                self.connection.connection.autocommit(autocommit)
-            except (Exception, ) as e:
-                logger.exception('unable to set database(%s) autocommit: %s', self.alias, e)
+    def _set_dbapi_autocommit(self, autocommit):
+        self.connection.connection.autocommit(autocommit)

dj_db_conn_pool/core/mixins.py

@@ -20,12 +20,17 @@ def __str__(self):
 
     __repr__ = __str__
 
+    def _set_dbapi_autocommit(self, autocommit):
+        self.connection.connection.autocommit = autocommit
+
     def _set_autocommit(self, autocommit):
         with self.wrap_database_errors:
             try:
-                self.connection.connection.autocommit = autocommit
-            except (Exception, ) as e:
-                logger.exception('unable to set database(%s) autocommit: %s', self.alias, e)
+                self._set_dbapi_autocommit(autocommit)
+            except (Exception, ) as exc:
+                logger.exception('unable to set autocommit mode of %s(%s) to %s, caused by: %s',
+                                 self.vendor, self.alias, autocommit, exc)
+                raise exc from None
 
     def _get_new_connection(self, conn_params):
         return super(PooledDatabaseWrapperMixin, self).get_new_connection(conn_params)