From 7c8942d4eb327086e50d39f87f8aa22553fc7c9f Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 11 Mar 2010 21:23:25 -0500 Subject: [PATCH] Added a non-freetds specific exclusion for pyodbc --- lib/sqlalchemy/dialects/mssql/pyodbc.py | 6 +++--- test/sql/test_query.py | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/sqlalchemy/dialects/mssql/pyodbc.py b/lib/sqlalchemy/dialects/mssql/pyodbc.py index a4c7d4bfcf..9ef065b1a9 100644 --- a/lib/sqlalchemy/dialects/mssql/pyodbc.py +++ b/lib/sqlalchemy/dialects/mssql/pyodbc.py @@ -66,13 +66,13 @@ class MSDialect_pyodbc(PyODBCConnector, MSDialect): dbapi_con = connection.connection - self._free_tds = re.match(r".*libtdsodbc.*\.so", dbapi_con.getinfo(pyodbc.SQL_DRIVER_NAME)) + self.freetds = re.match(r".*libtdsodbc.*\.so", dbapi_con.getinfo(pyodbc.SQL_DRIVER_NAME)) # the "Py2K only" part here is theoretical. # have not tried pyodbc + python3.1 yet. # Py2K - self.supports_unicode_statements = not self._free_tds - self.supports_unicode_binds = not self._free_tds + self.supports_unicode_statements = not self.freetds + self.supports_unicode_binds = not self.freetds # end Py2K dialect = MSDialect_pyodbc diff --git a/test/sql/test_query.py b/test/sql/test_query.py index 62da772a4c..064cfb236b 100644 --- a/test/sql/test_query.py +++ b/test/sql/test_query.py @@ -769,6 +769,10 @@ class QueryTest(TestBase): @testing.emits_warning('.*empty sequence.*') @testing.fails_on('firebird', "kinterbasdb doesn't send full type information") + @testing.fails_if(lambda: + (testing.db.name, testing.db.driver == 'mssql', 'pyodbc') + and not testing.db.dialect.freetds, + "not supported by Windows ODBC driver") def test_bind_in(self): users.insert().execute(user_id = 7, user_name = 'jack') users.insert().execute(user_id = 8, user_name = 'fred') -- 2.47.3