diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-06-02 23:05:33 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-06-02 23:05:33 +0000 |
| commit | 4bbbe40dadc7357c54f60c293e1b324e4330803e (patch) | |
| tree | 7291f93ad85399fdef9a496bd859f5f41d4fb9ed /lib/sqlalchemy/databases | |
| parent | cfcf47338d56cffd1731d93202aa10ce0fec76c4 (diff) | |
| download | sqlalchemy-4bbbe40dadc7357c54f60c293e1b324e4330803e.tar.gz | |
confirmed that makedsn works with host/port/sid
Diffstat (limited to 'lib/sqlalchemy/databases')
| -rw-r--r-- | lib/sqlalchemy/databases/oracle.py | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py index a1aa09d4e..f6a819ebb 100644 --- a/lib/sqlalchemy/databases/oracle.py +++ b/lib/sqlalchemy/databases/oracle.py @@ -123,8 +123,23 @@ class OracleDialect(ansisql.ANSIDialect): return self.module def create_connect_args(self, url): - opts = url.translate_connect_args(['dsn', None, 'user', 'password']) - opts['threaded'] = self.threaded + if url.database: + # if we have a database, then we have a remote host + port = url.port + if port: + port = int(port) + else: + port = 1521 + dsn = self.module.makedsn(url.host,port,url.database) + else: + # we have a local tnsname + dsn = url.host + opts = dict( + user=url.username, + password=url.password, + dsn = dsn, + threaded = self.threaded + ) return ([], opts) def type_descriptor(self, typeobj): |