diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2016-05-16 13:11:54 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ln3.zzzcomputing.com> | 2016-05-16 13:11:54 -0400 |
| commit | 88cd6e4706cc2adb25907e129b3cf37e52be9fc1 (patch) | |
| tree | 8e3030c5e8282839cb9d43c2b23c65d646dbcfd9 /lib/sqlalchemy | |
| parent | 1873d8107ac8cf4258440914d68f12332220e244 (diff) | |
| parent | 9611ba3a9d7cb134869d3b17949a33647bd56045 (diff) | |
| download | sqlalchemy-88cd6e4706cc2adb25907e129b3cf37e52be9fc1.tar.gz | |
Merge "Fix TypeError during cx_Oracle connection"
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/cx_oracle.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py index 0c93ced97..cfd942d85 100644 --- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py +++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py @@ -914,13 +914,17 @@ class OracleDialect_cx_oracle(OracleDialect): dsn = url.host opts = dict( - user=url.username, - password=url.password, - dsn=dsn, threaded=self.threaded, twophase=self.allow_twophase, ) + if dsn is not None: + opts['dsn'] = dsn + if url.password is not None: + opts['password'] = url.password + if url.username is not None: + opts['user'] = url.username + if util.py2k: if self._cx_oracle_with_unicode: for k, v in opts.items(): |