diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-03-12 21:07:03 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-03-12 21:07:03 +0000 |
| commit | b9d275fdc134376b3e81066870b92a8c84c0705c (patch) | |
| tree | 0c9f390081a8c0a6f49e682a75023a4ba9c62001 /lib/sqlalchemy/engine/default.py | |
| parent | d1983c22b416c92f3d9a9d3816a44a8b7e190092 (diff) | |
| parent | 022e8124ca6e1d032b7ac370692a0c7027aa8bdc (diff) | |
| download | sqlalchemy-b9d275fdc134376b3e81066870b92a8c84c0705c.tar.gz | |
merge from oracle WITH_UNICODE branch
Diffstat (limited to 'lib/sqlalchemy/engine/default.py')
| -rw-r--r-- | lib/sqlalchemy/engine/default.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index 077627949..cfab01dc4 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -138,9 +138,17 @@ class DefaultDialect(base.Dialect): def _check_unicode_returns(self, connection): cursor = connection.connection.cursor() + # Py2K + if self.supports_unicode_statements: + cast_to = unicode + else: + cast_to = str + # end Py2K + # Py3K + #cast_to = str def check_unicode(type_): cursor.execute( - str( + cast_to( expression.select( [expression.cast( expression.literal_column("'test unicode returns'"), type_) |