summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects/mssql/pymssql.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-10-24 12:00:58 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2010-10-24 12:00:58 -0400
commita29f130be7a1589566547e94c0e283f0210f27ef (patch)
treec08b079cebb5e96c0d2ed734cd9dc5e75e23f96d /lib/sqlalchemy/dialects/mssql/pymssql.py
parent9c0d6c0a2326d00579c87c140890e6a9b65b6d32 (diff)
downloadsqlalchemy-a29f130be7a1589566547e94c0e283f0210f27ef.tar.gz
- mssql+pymssql dialect now honors the "port" portion
of the URL instead of discarding it. [ticket:1952] - testing.only_on() accepts db specs optionally as a list
Diffstat (limited to 'lib/sqlalchemy/dialects/mssql/pymssql.py')
-rw-r--r--lib/sqlalchemy/dialects/mssql/pymssql.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/mssql/pymssql.py b/lib/sqlalchemy/dialects/mssql/pymssql.py
index b6728c6b0..c5f471942 100644
--- a/lib/sqlalchemy/dialects/mssql/pymssql.py
+++ b/lib/sqlalchemy/dialects/mssql/pymssql.py
@@ -85,7 +85,9 @@ class MSDialect_pymssql(MSDialect):
def create_connect_args(self, url):
opts = url.translate_connect_args(username='user')
opts.update(url.query)
- opts.pop('port', None)
+ port = opts.pop('port', None)
+ if port and 'host' in opts:
+ opts['host'] = "%s:%s" % (opts['host'], port)
return [[], opts]
def is_disconnect(self, e):
@@ -99,4 +101,4 @@ class MSDialect_pymssql(MSDialect):
else:
return False
-dialect = MSDialect_pymssql \ No newline at end of file
+dialect = MSDialect_pymssql