Updated SqlAlchemy + the new files

sqlalchemy/dialects/mssql/adodbapi.py

@@ -1,15 +1,34 @@
-"""
-The adodbapi dialect is not implemented for 0.6 at this time.
+# mssql/adodbapi.py
+# Copyright (C) 2005-2017 the SQLAlchemy authors and contributors
+# <see AUTHORS file>
+#
+# This module is part of SQLAlchemy and is released under
+# the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 """
+.. dialect:: mssql+adodbapi
+    :name: adodbapi
+    :dbapi: adodbapi
+    :connectstring: mssql+adodbapi://<username>:<password>@<dsnname>
+    :url: http://adodbapi.sourceforge.net/
+
+.. note::
+
+    The adodbapi dialect is not implemented SQLAlchemy versions 0.6 and
+    above at this time.
+
+"""
+import datetime
 from sqlalchemy import types as sqltypes, util
 from sqlalchemy.dialects.mssql.base import MSDateTime, MSDialect
 import sys
 
+
 class MSDateTime_adodbapi(MSDateTime):
     def result_processor(self, dialect, coltype):
         def process(value):
-            # adodbapi will return datetimes with empty time values as datetime.date() objects.
+            # adodbapi will return datetimes with empty time
+            # values as datetime.date() objects.
             # Promote them back to full datetime.datetime()
             if type(value) is datetime.date:
                 return datetime.datetime(value.year, value.month, value.day)
@@ -23,7 +42,7 @@ class MSDialect_adodbapi(MSDialect):
     supports_unicode = sys.maxunicode == 65535
     supports_unicode_statements = True
     driver = 'adodbapi'
-    
+
     @classmethod
     def import_dbapi(cls):
         import adodbapi as module
@@ -32,28 +51,37 @@ class MSDialect_adodbapi(MSDialect):
     colspecs = util.update_copy(
         MSDialect.colspecs,
         {
-            sqltypes.DateTime:MSDateTime_adodbapi
+            sqltypes.DateTime: MSDateTime_adodbapi
         }
     )
 
     def create_connect_args(self, url):
-        keys = url.query
+        def check_quote(token):
+            if ";" in str(token):
+                token = "'%s'" % token
+            return token
+
+        keys = dict(
+            (k, check_quote(v)) for k, v in url.query.items()
+        )
 
         connectors = ["Provider=SQLOLEDB"]
         if 'port' in keys:
-            connectors.append ("Data Source=%s, %s" % (keys.get("host"), keys.get("port")))
+            connectors.append("Data Source=%s, %s" %
+                              (keys.get("host"), keys.get("port")))
         else:
-            connectors.append ("Data Source=%s" % keys.get("host"))
-        connectors.append ("Initial Catalog=%s" % keys.get("database"))
+            connectors.append("Data Source=%s" % keys.get("host"))
+        connectors.append("Initial Catalog=%s" % keys.get("database"))
         user = keys.get("user")
         if user:
             connectors.append("User Id=%s" % user)
             connectors.append("Password=%s" % keys.get("password", ""))
         else:
             connectors.append("Integrated Security=SSPI")
-        return [[";".join (connectors)], {}]
+        return [[";".join(connectors)], {}]
 
-    def is_disconnect(self, e):
-        return isinstance(e, self.dbapi.adodbapi.DatabaseError) and "'connection failure'" in str(e)
+    def is_disconnect(self, e, connection, cursor):
+        return isinstance(e, self.dbapi.adodbapi.DatabaseError) and \
+            "'connection failure'" in str(e)
 
 dialect = MSDialect_adodbapi