diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-04-28 17:30:25 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-04-28 17:30:25 +0000 |
| commit | 7686386c0025c4364a7e34ef4b1fc71e6fc00374 (patch) | |
| tree | 5c049c8a171bd193f2e021806c24fbe6ff5cab4e | |
| parent | e1cd2563ed8601fffab1d1404471969d198d235e (diff) | |
| download | sqlalchemy-7686386c0025c4364a7e34ef4b1fc71e6fc00374.tar.gz | |
- oracle_xe 5 doesn't accept a Python unicode object in
its connect string in normal Python 2.x mode - so we coerce
to str() directly. non-ascii characters aren't supported
in connect strings here since we don't know what encoding
we could use. [ticket:1670]
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/cx_oracle.py | 5 |
2 files changed, 11 insertions, 0 deletions
@@ -29,6 +29,12 @@ CHANGES be used. This will impact decimal accuracy and some unicode handling issues. [ticket:1775] + - oracle_xe 5 doesn't accept a Python unicode object in + its connect string in normal Python 2.x mode - so we coerce + to str() directly. non-ascii characters aren't supported + in connect strings here since we don't know what encoding + we could use. [ticket:1670] + - firebird - Added a label to the query used within has_table() and has_sequence() to work with older versions of Firebird diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py index dd6763c09..80c0cc67f 100644 --- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py +++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py @@ -505,6 +505,11 @@ class OracleDialect_cx_oracle(OracleDialect): for k, v in opts.items(): if isinstance(v, str): opts[k] = unicode(v) + else: + for k, v in opts.items(): + if isinstance(v, unicode): + opts[k] = str(v) + # end Py2K if 'mode' in url.query: |