summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2017-08-19 18:04:51 -0400
committerGerrit Code Review <gerrit@awstats.zzzcomputing.com>2017-08-19 18:04:51 -0400
commit0628499690a930a13b1ba8a5c39182f7163db629 (patch)
tree8a19351425e78ffe36f172eda339b730b97db98d /lib
parentecdd922d9627c60058833fbcc2c8c2bc06d7332b (diff)
parent03255a5a0fc6aa8acfff99ed9e62d58054b8b6af (diff)
downloadsqlalchemy-0628499690a930a13b1ba8a5c39182f7163db629.tar.gz
Merge "First level repair for cx_Oracle 6.0 test regressions"
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/dialects/oracle/cx_oracle.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py
index 4e9f6314b..86562dfd0 100644
--- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py
+++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py
@@ -863,6 +863,7 @@ class OracleDialect_cx_oracle(OracleDialect):
size, precision, scale):
# convert all NUMBER with precision + positive scale to Decimal
# this almost allows "native decimal" mode.
+
if self.supports_native_decimal and \
defaultType == cx_Oracle.NUMBER and \
precision and scale > 0:
@@ -971,7 +972,8 @@ class OracleDialect_cx_oracle(OracleDialect):
def is_disconnect(self, e, connection, cursor):
error, = e.args
- if isinstance(e, self.dbapi.InterfaceError):
+ if isinstance(e, (
+ self.dbapi.InterfaceError, self.dbapi.DatabaseError)):
return "not connected" in str(e)
elif hasattr(error, 'code'):
# ORA-00028: your session has been killed