From: Rick Morrison <rickmorrison@gmail.com>
Date: Wed, 28 Mar 2007 19:13:03 +0000 (+0000)
Subject: Change to ParameterClause object change
X-Git-Tag: rel_0_3_7~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f72bb357181e0f90e222f3721f2554f6ead08e86;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Change to ParameterClause object change
New syntax for adodbapi connection string with port
---

diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index ff756dd802..55bf03873f 100644
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -245,9 +245,9 @@ class MSSQLExecutionContext(default.DefaultExecutionContext):
             self.HASIDENT = bool(tbl.has_sequence)
             if engine.dialect.auto_identity_insert and self.HASIDENT:
                 if isinstance(parameters, list):
-                    self.IINSERT = parameters[0].has_key(tbl.has_sequence.key)
+                    self.IINSERT = hasattr(parameters[0], tbl.has_sequence.key)
                 else:
-                    self.IINSERT = parameters.has_key(tbl.has_sequence.key)
+                    self.IINSERT = hasattr(parameters, tbl.has_sequence.key)
             else:
                 self.IINSERT = False
 
@@ -663,7 +663,10 @@ class MSSQLDialect_adodbapi(MSSQLDialect):
 
     def make_connect_string(self, keys):
         connectors = ["Provider=SQLOLEDB"]
-        connectors.append ("Data Source=%s" % keys.get("host"))
+        if 'port' in keys:
+            connectors.append ("Data Source=%s, %s" % (keys.get("host"), keys.get("port")))
+        else:
+            connectors.append ("Data Source=%s" % keys.get("host"))
         connectors.append ("Initial Catalog=%s" % keys.get("database"))
         user = keys.get("user")
         if user: