diff options
| author | Michael Trier <mtrier@gmail.com> | 2009-01-02 03:29:33 +0000 |
|---|---|---|
| committer | Michael Trier <mtrier@gmail.com> | 2009-01-02 03:29:33 +0000 |
| commit | 50e077ee52b404092cc4fc1969169ed5ed00e9f5 (patch) | |
| tree | c7ffe85fba52bd95347cc17e038ddbeb816df191 /lib/sqlalchemy/databases/mssql.py | |
| parent | 3373994cfd3fcd0af4d805d2b8d1ba2ce0a6d903 (diff) | |
| download | sqlalchemy-50e077ee52b404092cc4fc1969169ed5ed00e9f5.tar.gz | |
Cleanup of r5556. Makes the description_encoding less public since this is a
workaround for the pyodbc dbapi.
Diffstat (limited to 'lib/sqlalchemy/databases/mssql.py')
| -rw-r--r-- | lib/sqlalchemy/databases/mssql.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py index 490e562e9..965cf5758 100644 --- a/lib/sqlalchemy/databases/mssql.py +++ b/lib/sqlalchemy/databases/mssql.py @@ -923,7 +923,7 @@ class MSSQLDialect(default.DefaultDialect): auto_identity_insert=True, query_timeout=None, text_as_varchar=False, use_scope_identity=False, has_window_funcs=False, max_identifier_length=None, - schema_name="dbo", description_encoding='utf-8', **opts): + schema_name="dbo", **opts): self.auto_identity_insert = bool(auto_identity_insert) self.query_timeout = int(query_timeout or 0) self.schema_name = schema_name @@ -933,7 +933,7 @@ class MSSQLDialect(default.DefaultDialect): self.use_scope_identity = bool(use_scope_identity) self.has_window_funcs = bool(has_window_funcs) self.max_identifier_length = int(max_identifier_length or 0) or 128 - super(MSSQLDialect, self).__init__(description_encoding=description_encoding, **opts) + super(MSSQLDialect, self).__init__(**opts) @classmethod def dbapi(cls, module_name=None): @@ -1240,7 +1240,8 @@ class MSSQLDialect_pyodbc(MSSQLDialect): execution_ctx_cls = MSSQLExecutionContext_pyodbc def __init__(self, description_encoding='latin-1', **params): - super(MSSQLDialect_pyodbc, self).__init__(description_encoding=description_encoding, **params) + super(MSSQLDialect_pyodbc, self).__init__(**params) + self.description_encoding = description_encoding # FIXME: scope_identity sniff should look at server version, not the ODBC driver # whether use_scope_identity will work depends on the version of pyodbc try: |