From 14390939bdd06ad48efe226575e7b9d38b12c08e Mon Sep 17 00:00:00 2001 From: Michael Trier Date: Mon, 5 Oct 2009 02:38:39 +0000 Subject: [PATCH] Corrected problem with a Trusted Connection under MSSQL 2008 native driver. --- lib/sqlalchemy/connectors/pyodbc.py | 2 +- lib/sqlalchemy/dialects/mssql/base.py | 2 +- test/dialect/test_mssql.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/sqlalchemy/connectors/pyodbc.py b/lib/sqlalchemy/connectors/pyodbc.py index 4f8d6d517f..ebe28c6829 100644 --- a/lib/sqlalchemy/connectors/pyodbc.py +++ b/lib/sqlalchemy/connectors/pyodbc.py @@ -48,7 +48,7 @@ class PyODBCConnector(Connector): 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/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py index 9964a28436..76846b6b43 100644 --- a/lib/sqlalchemy/dialects/mssql/base.py +++ b/lib/sqlalchemy/dialects/mssql/base.py @@ -42,7 +42,7 @@ Examples of pyodbc connection string URLs: * *mssql+pyodbc://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+pyodbc://user:pass@mydsn* - connects using the DSN named ``mydsn`` passing in the ``UID`` and ``PWD`` information. The diff --git a/test/dialect/test_mssql.py b/test/dialect/test_mssql.py index ddb57c5b92..68f3816a56 100644 --- a/test/dialect/test_mssql.py +++ b/test/dialect/test_mssql.py @@ -623,12 +623,12 @@ class ParseConnectTest(TestBase, AssertsCompiledSQL): def test_pyodbc_connect_dsn_trusted(self): u = url.make_url('mssql://mydsn') 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') 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') -- 2.47.2