summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/default.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-03-12 21:05:53 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2010-03-12 21:05:53 +0000
commit022e8124ca6e1d032b7ac370692a0c7027aa8bdc (patch)
treec39b52ec634b6516284ff815e18f638b488c31a9 /lib/sqlalchemy/engine/default.py
parent1b169548642b4ced5b25510d35fdd28af0c06c7e (diff)
downloadsqlalchemy-022e8124ca6e1d032b7ac370692a0c7027aa8bdc.tar.gz
- Added preliminary support for Oracle's WITH_UNICODE
mode. At the very least this establishes initial support for cx_Oracle with Python 3. [ticket:1670]
Diffstat (limited to 'lib/sqlalchemy/engine/default.py')
-rw-r--r--lib/sqlalchemy/engine/default.py10
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_)