[SQL-CVS] r1455 - home/phd/SQLObject/paramstyles/sqlobject/mssql

[<sub...@co...>]

Author: phd
Date: 2006-01-03 12:23:20 +0000 (Tue, 03 Jan 2006)
New Revision: 1455

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py
Log:
Merged patches from the revisions 1452:1454 from the trunk

Modified: home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py	2006-01-03 12:20:29 UTC (rev 1454)
+++ home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py	2006-01-03 12:23:20 UTC (rev 1455)
@@ -19,17 +19,26 @@
                 self.dbconnection = sqlmodule.connect
                 # ADO uses unicode only (AFAIK)
                 self.usingUnicodeStrings = True
+
+                # Need to use SQLNCLI provider for SQL Server Express Edition
+                if kw.get("ncli"):
+                    conn_str = "Provider=SQLNCLI;"
+                else:
+                    conn_str = "Provider=SQLOLEDB;"
+
+                conn_str += "Data Source=%s;Initial Catalog=%s;"
+
                 # MSDE does not allow SQL server login 
-                if "sspi" in kw and kw["sspi"]:
-                    self.make_conn_str = lambda keys: \
-                    ["Provider=SQLOLEDB;Data Source=%s;Initial Catalog=%s;Integrated Security=SSPI;Persist Security Info=False" % (
-                        keys.host, keys.db)]
+                if kw.get("sspi"):
+                    conn_str += "Integrated Security=SSPI;Persist Security Info=False"
+                    self.make_conn_str = lambda keys: [conn_str % (keys.host, keys.db)]
                 else:
-                    self.make_conn_str = lambda keys: \
-                    ["Provider=SQLOLEDB;Data Source=%s;User Id=%s;Password=%s;Initial Catalog=%s" % (
-                            keys.host, keys.user, keys.password, keys.db)]
-                if "sspi" in kw:
-                    del kw["sspi"]
+                    conn_str += "User Id=%s;Password=%s"
+                    self.make_conn_str = lambda keys: [conn_str % (keys.host, keys.db, keys.user, keys.password)]
+
+                col.popKey(kw, "sspi")
+                col.popKey(kw, "ncli")
+
             except ImportError: # raise the exceptions other than ImportError for adodbapi absence
                 import pymssql as sqlmodule
                 self.dbconnection = sqlmodule.connect