[SQL-CVS] r4646 - in SQLObject/trunk: docs sqlobject/mssql

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

Author: phd
Date: Fri Aug 16 13:58:36 2013
New Revision: 4646

Log:
Merged revisions 4644, 4645 from branch 1.5: fixed parameters for pymssql

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/mssql/mssqlconnection.py

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Fri Aug 16 13:57:20 2013	(r4645)
+++ SQLObject/trunk/docs/News.txt	Fri Aug 16 13:58:36 2013	(r4646)
@@ -30,6 +30,8 @@
 * A bug was fixed in DBConnection.close(); close() doesn't raise
   an UnboundLocalError if connection pool is empty.
 
+* Fixed parameters for pymssql.
+
 SQLObject 1.4.1
 ===============
 

Modified: SQLObject/trunk/sqlobject/mssql/mssqlconnection.py
==============================================================================
--- SQLObject/trunk/sqlobject/mssql/mssqlconnection.py	Fri Aug 16 13:57:20 2013	(r4645)
+++ SQLObject/trunk/sqlobject/mssql/mssqlconnection.py	Fri Aug 16 13:58:36 2013	(r4646)
@@ -61,16 +61,25 @@
             sqlmodule.Binary = lambda st: str(st)
             # don't know whether pymssql uses unicode
             self.usingUnicodeStrings = False
-            self.make_conn_str = lambda keys:  \
-                   ["", keys.user, keys.password, keys.host, keys.db]
+            def _make_conn_str(keys):
+                keys_dict = {}
+                for attr, value in (
+                    ('user', keys.user),
+                    ('password', keys.password),
+                    ('host', keys.host),
+                    ('port', keys.port),
+                    ('database', keys.db),
+                ):
+                    if value: keys_dict[attr] = value
+                return keys_dict
+            self.make_conn_str = _make_conn_str
 
         self.autoCommit=int(autoCommit)
+        self.user = user
+        self.password = password
         self.host = host
         self.port = port
         self.db = db
-        self.user = user
-        self.password = password
-        self.password = password
         self._can_use_max_types = None
         DBAPI.__init__(self, **kw)