From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 1 Jun 2006 20:52:12 +0000 (+0000)
Subject: fixed host connector again, now for [ticket:197]
X-Git-Tag: rel_0_2_2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9e9c25380b7c7d975e731a0fa0cb021c34aa920;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fixed host connector again, now for [ticket:197]
---

diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index 0745cf7844..a1aa09d4ef 100644
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -123,19 +123,8 @@ class OracleDialect(ansisql.ANSIDialect):
         return self.module
 
     def create_connect_args(self, url):
-        if url.database:
-            # if we have a database, then we have a remote host
-            port = url.port or 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
-            )        
+        opts = url.translate_connect_args(['dsn', None, 'user', 'password'])
+        opts['threaded'] = self.threaded
         return ([], opts)
         
     def type_descriptor(self, typeobj):