diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2020-04-10 20:50:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2020-04-10 20:50:47 +0000 |
| commit | 45dd9ea2cf8b25ba672a94670263b1b9f441e686 (patch) | |
| tree | 988d70935e3c16bd65d0847ad8f87c6453f46c90 /lib/sqlalchemy/dialects | |
| parent | 046934083bbf0193e29c990bed0527fdac56f9a8 (diff) | |
| parent | 24137da80da879e7792f45302ae5c100524253be (diff) | |
| download | sqlalchemy-45dd9ea2cf8b25ba672a94670263b1b9f441e686.tar.gz | |
Merge "Evaluate fixes for cx_Oracle 8 API changes"
Diffstat (limited to 'lib/sqlalchemy/dialects')
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/cx_oracle.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py index 2ac5510d1..0f41d7ed8 100644 --- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py +++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py @@ -912,7 +912,11 @@ class OracleDialect_cx_oracle(OracleDialect): def output_type_handler( cursor, name, default_type, size, precision, scale ): - if default_type == cx_Oracle.NUMBER: + + if ( + default_type == cx_Oracle.NUMBER + and default_type is not cx_Oracle.NATIVE_FLOAT + ): if not dialect.coerce_to_decimal: return None elif precision == 0 and scale in (0, -127): @@ -934,9 +938,11 @@ class OracleDialect_cx_oracle(OracleDialect): ) # allow all strings to come back natively as Unicode - elif dialect.coerce_to_unicode and default_type in ( - cx_Oracle.STRING, - cx_Oracle.FIXED_CHAR, + elif ( + dialect.coerce_to_unicode + and default_type in (cx_Oracle.STRING, cx_Oracle.FIXED_CHAR,) + and default_type is not cx_Oracle.CLOB + and default_type is not cx_Oracle.NCLOB ): if compat.py2k: outconverter = processors.to_unicode_processor_factory( @@ -1064,7 +1070,6 @@ class OracleDialect_cx_oracle(OracleDialect): util.coerce_kw_type(opts, "threaded", bool) util.coerce_kw_type(opts, "events", bool) util.coerce_kw_type(opts, "purity", convert_cx_oracle_constant) - return ([], opts) def _get_server_version_info(self, connection): |