Merge branch 'azure-1.11' into azure-2.0

Author: michiya

sql_server/pyodbc/client.py

@@ -1,4 +1,5 @@
 import re
+import subprocess
 
 from django.db.backends.base.client import BaseDatabaseClient
 
@@ -11,8 +12,8 @@ def runshell(self):
         user = options.get('user', settings_dict['USER'])
         password = options.get('passwd', settings_dict['PASSWORD'])
 
-        driver = options.get('driver', '')
-        ms_drivers = re.compile('.*SQL (Server$|(Server )?Native Client)')
+        driver = options.get('driver', 'ODBC Driver 13 for SQL Server')
+        ms_drivers = re.compile('^ODBC Driver .* for SQL Server$|^SQL Server Native Client')
         if not ms_drivers.match(driver):
             self.executable_name = 'isql'
 
@@ -24,6 +25,8 @@ def runshell(self):
 
             args = [self.executable_name]
             if server:
+                if port:
+                    server = ','.join((server, port))
                 args += ["-S", server]
             if user:
                 args += ["-U", user]
@@ -39,8 +42,7 @@ def runshell(self):
             dsn = options.get('dsn', '')
             args = ['%s -v %s %s %s' % (self.executable_name, dsn, user, password)]
 
-        import subprocess
         try:
-            subprocess.call(args, shell=True)
+            subprocess.check_call(args)
         except KeyboardInterrupt:
             pass