From: Paul Johnston <paj@pajhome.org.uk>
Date: Mon, 3 Sep 2007 13:57:08 +0000 (+0000)
Subject: Minor fixes to MSSQL reflection
X-Git-Tag: rel_0_4beta6~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e75ec97c2b74741f273cac55b90f227d00e35d93;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Minor fixes to MSSQL reflection
---

diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index 5f07ac2965..3e8949e14f 100644
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -580,8 +580,8 @@ class MSSQLDialect(default.DefaultDialect):
                     warnings.warn(RuntimeWarning("Did not recognize type '%s' of column '%s'" % (type, name)))
                     coltype = sqltypes.NULLTYPE
                     
-                elif coltype == MSNVarchar and charlen == -1:
-                    charlen = None
+                elif coltype in (MSNVarchar, AdoMSNVarchar) and charlen == -1:
+                    args[0] = None
                 coltype = coltype(*args)
             colargs= []
             if default is not None:
@@ -593,7 +593,7 @@ class MSSQLDialect(default.DefaultDialect):
             raise exceptions.NoSuchTableError(table.name)
 
         # We also run an sp_columns to check for identity columns:
-        cursor = connection.execute("sp_columns " + self.identifier_preparer.format_table(table))
+        cursor = connection.execute("sp_columns [%s]" % self.identifier_preparer.format_table(table))
         ic = None
         while True:
             row = cursor.fetchone()