- Changed the name of TrustedConnection to

Trusted_Connection when constructing pyodbc connect
arguments [ticket:1561]

diff --git a/CHANGES b/CHANGES
index 49e3e2b232551903a40b1c52f16cb641f70ce728..5212f0450d53ddc8e3ebeff85484c510a6fae3e2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -28,6 +28,11 @@ CHANGES
       via a new postgres.PGDoublePrecision object.  
       This is postgresql.DOUBLE_PRECISION in 0.6.
       [ticket:1085]
+
+- mssql
+    - Changed the name of TrustedConnection to 
+      Trusted_Connection when constructing pyodbc connect
+      arguments [ticket:1561]
       
 0.5.6
 =====

diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index d963b7477096c81195adabad4dded0943b63c51c..acd81408e428cb146479dc3b233954a5347284bc 100644 (file)
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -42,7 +42,7 @@ Examples of pyodbc connection string URLs:
 * *mssql://mydsn* - connects using the specified DSN named ``mydsn``.
   The connection string that is created will appear like::
 
-    dsn=mydsn;TrustedConnection=Yes
+    dsn=mydsn;Trusted_Connection=Yes
 
 * *mssql://user:pass@mydsn* - connects using the DSN named
   ``mydsn`` passing in the ``UID`` and ``PWD`` information. The
@@ -1451,7 +1451,7 @@ class MSSQLDialect_pyodbc(MSSQLDialect):
                 connectors.append("UID=%s" % user)
                 connectors.append("PWD=%s" % keys.pop('password', ''))
             else:
-                connectors.append("TrustedConnection=Yes")
+                connectors.append("Trusted_Connection=Yes")
 
             # if set to 'Yes', the ODBC layer will try to automagically convert
             # textual data from your database encoding to your client encoding

diff --git a/test/dialect/test_mssql.py b/test/dialect/test_mssql.py
index dd86ce0de2822b1d1d4c9b77f85029520b1345b0..5a69f09dae2134e89469907f693b5f92716f5b72 100644 (file)
--- a/test/dialect/test_mssql.py
+++ b/test/dialect/test_mssql.py
@@ -519,13 +519,13 @@ class ParseConnectTest(TestBase, AssertsCompiledSQL):
         u = url.make_url('mssql://mydsn')
         dialect = mssql.MSSQLDialect_pyodbc()
         connection = dialect.create_connect_args(u)
-        eq_([['dsn=mydsn;TrustedConnection=Yes'], {}], connection)
+        eq_([['dsn=mydsn;Trusted_Connection=Yes'], {}], connection)
 
     def test_pyodbc_connect_old_style_dsn_trusted(self):
         u = url.make_url('mssql:///?dsn=mydsn')
         dialect = mssql.MSSQLDialect_pyodbc()
         connection = dialect.create_connect_args(u)
-        eq_([['dsn=mydsn;TrustedConnection=Yes'], {}], connection)
+        eq_([['dsn=mydsn;Trusted_Connection=Yes'], {}], connection)
 
     def test_pyodbc_connect_dsn_non_trusted(self):
         u = url.make_url('mssql://username:password@mydsn')