diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-03-22 10:13:15 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-03-22 10:13:15 -0400 |
| commit | 28edc2604a96d5ecd8318232c95a034433aa07d1 (patch) | |
| tree | 14f80cda668a95325ccda65f7b0c88612e1aea96 /lib/sqlalchemy/dialects | |
| parent | 711d29f8e4dc096f5083c075a1f64eb38e2d2e4a (diff) | |
| download | sqlalchemy-28edc2604a96d5ecd8318232c95a034433aa07d1.tar.gz | |
Use config.db global opts as defaults for all testing_engine()
Some options need to be passed to engines in all cases,
such as currently the oracle 12516 workaround. make sure
calls to testing_engine also set up the dictionary with
defaults even if options is passed. not clear if this affects
other backends yet.
Change-Id: I5a1f7634e4ce5af6fe55dc21a24db6afacd19bb7
Diffstat (limited to 'lib/sqlalchemy/dialects')
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/cx_oracle.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py index 6789cd49f..93b6987ac 100644 --- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py +++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py @@ -795,6 +795,8 @@ class OracleDialect_cx_oracle(OracleDialect): if "ORA-12516" in str(err): time.sleep(2) return self.dbapi.connect(*cargs, **cparams) + else: + raise else: return super(OracleDialect_cx_oracle, self).connect( *cargs, **cparams) |