diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-07-14 18:54:23 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-07-14 18:54:23 -0400 |
| commit | 0add251ea0be13a54c410f3c6e145e52482fb31d (patch) | |
| tree | 577df6ce3fd2cd11c75268bf7b7bcfa28e34a859 /lib | |
| parent | ec40a84d96e43f35c54e7a9d398dc98ea7b16c50 (diff) | |
| download | sqlalchemy-0add251ea0be13a54c410f3c6e145e52482fb31d.tar.gz | |
- In the SQL Server pyodbc dialect, repaired the implementation
for the ``description_encoding`` dialect parameter, which when
not explicitly set was preventing cursor.description from
being parsed correctly in the case of result sets that
contained names in alternate encodings. This parameter
shouldn't be needed going forward.
fixes #3091
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/dialects/mssql/pyodbc.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/dialects/mssql/pyodbc.py b/lib/sqlalchemy/dialects/mssql/pyodbc.py index ab45fa25e..31c55f502 100644 --- a/lib/sqlalchemy/dialects/mssql/pyodbc.py +++ b/lib/sqlalchemy/dialects/mssql/pyodbc.py @@ -250,8 +250,9 @@ class MSDialect_pyodbc(PyODBCConnector, MSDialect): ) def __init__(self, description_encoding=None, **params): + if 'description_encoding' in params: + self.description_encoding = params.pop('description_encoding') super(MSDialect_pyodbc, self).__init__(**params) - self.description_encoding = description_encoding self.use_scope_identity = self.use_scope_identity and \ self.dbapi and \ hasattr(self.dbapi.Cursor, 'nextset') |