From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 29 Aug 2017 18:31:43 +0000 (-0400)
Subject: Implement AUTOCOMMIT for pyodbc, pymssql
X-Git-Tag: origin~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56950a78db62d880a2f2c240c8c5873af86310c2;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Implement AUTOCOMMIT for pyodbc, pymssql

In prep for CI coverage for SQL Server, allow AUTOCOMMIT
isolation level to work

Change-Id: I850b977e75f53385986f2c181be4e4412dd3b3f4
---

diff --git a/doc/build/changelog/migration_12.rst b/doc/build/changelog/migration_12.rst
index 14e61a04e3..36b2819fa9 100644
--- a/doc/build/changelog/migration_12.rst
+++ b/doc/build/changelog/migration_12.rst
@@ -1406,3 +1406,10 @@ as the "owner".
     :ref:`multipart_schema_names`
 
 :ticket:`2626`
+
+AUTOCOMMIT isolation level support
+----------------------------------
+
+Both the PyODBC and pymssql dialects now support the "AUTOCOMMIT" isolation
+level as set by :meth:`.Connection.execution_options` which will establish
+the correct flags on the DBAPI connection object.
diff --git a/doc/build/changelog/unreleased_12/sql_server_isolation.rst b/doc/build/changelog/unreleased_12/sql_server_isolation.rst
new file mode 100644
index 0000000000..47f4831831
--- /dev/null
+++ b/doc/build/changelog/unreleased_12/sql_server_isolation.rst
@@ -0,0 +1,8 @@
+.. change::
+    :tags: feature, mssql
+
+    Added support for "AUTOCOMMIT" isolation level, as established
+    via :meth:`.Connection.execution_options`, to the
+    PyODBC and pymssql dialects.   This isolation level sets the
+    appropriate DBAPI-specific flags on the underlying
+    connection object.
\ No newline at end of file
diff --git a/lib/sqlalchemy/connectors/pyodbc.py b/lib/sqlalchemy/connectors/pyodbc.py
index ee8445dae4..65fe37212e 100644
--- a/lib/sqlalchemy/connectors/pyodbc.py
+++ b/lib/sqlalchemy/connectors/pyodbc.py
@@ -194,3 +194,17 @@ class PyODBCConnector(Connector):
             except ValueError:
                 version.append(n)
         return tuple(version)
+
+    def set_isolation_level(self, connection, level):
+        # adjust for ConnectionFairy being present
+        # allows attribute set e.g. "connection.autocommit = True"
+        # to work properly
+        if hasattr(connection, 'connection'):
+            connection = connection.connection
+
+        if level == 'AUTOCOMMIT':
+            connection.autocommit = True
+        else:
+            connection.autocommit = False
+            super(PyODBCConnector, self).set_isolation_level(connection,
+                                                             level)
diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index 00c43bba6a..05381d671e 100644
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -250,6 +250,7 @@ To set using per-connection execution options::
 
 Valid values for ``isolation_level`` include:
 
+* ``AUTOCOMMIT`` - pyodbc / pymssql-specific
 * ``READ COMMITTED``
 * ``READ UNCOMMITTED``
 * ``REPEATABLE READ``
@@ -259,6 +260,7 @@ Valid values for ``isolation_level`` include:
 .. versionadded:: 1.1 support for isolation level setting on Microsoft
    SQL Server.
 
+.. versionadded:: 1.2 added AUTOCOMMIT isolation level setting
 
 Nullability
 -----------
diff --git a/lib/sqlalchemy/dialects/mssql/pymssql.py b/lib/sqlalchemy/dialects/mssql/pymssql.py
index 57ca8ab3d4..cd800471d4 100644
--- a/lib/sqlalchemy/dialects/mssql/pymssql.py
+++ b/lib/sqlalchemy/dialects/mssql/pymssql.py
@@ -94,4 +94,12 @@ class MSDialect_pymssql(MSDialect):
         else:
             return False
 
+    def set_isolation_level(self, connection, level):
+        if level == 'AUTOCOMMIT':
+            connection.autocommit(True)
+        else:
+            connection.autocommit(False)
+            super(MSDialect_pymssql, self).set_isolation_level(connection,
+                                                                level)
+
 dialect = MSDialect_pymssql
diff --git a/test/requirements.py b/test/requirements.py
index 4fcf541e31..4f01eac9bc 100644
--- a/test/requirements.py
+++ b/test/requirements.py
@@ -268,7 +268,7 @@ class DefaultRequirements(SuiteRequirements):
     def autocommit(self):
         """target dialect supports 'AUTOCOMMIT' as an isolation_level"""
         return only_on(
-            ('postgresql', 'mysql'),
+            ('postgresql', 'mysql', 'mssql+pyodbc', 'mssql+pymssql'),
             "dialect does not support AUTOCOMMIT isolation mode")
 
     @property