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

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

Author: phd
Date: 2007-01-10 06:41:05 -0700 (Wed, 10 Jan 2007)
New Revision: 2187

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py
Log:
Merged patches from the revisions 2182:2186 from the trunk: fixed a bug in MSSQLConnection caused by column names being unicode (patch 1613369).

Modified: home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py	2007-01-10 13:36:30 UTC (rev 2186)
+++ home/phd/SQLObject/paramstyles/sqlobject/mssql/mssqlconnection.py	2007-01-10 13:41:05 UTC (rev 2187)
@@ -220,8 +220,8 @@
                 continue
             # precision is needed for decimal columns
             colClass, kw = self.guessClass(t, size, precision, scale)
-            kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)
-            kw['dbName'] = field
+            kw['name'] = str(soClass.sqlmeta.style.dbColumnToPythonAttr(field))
+            kw['dbName'] = str(field)
             kw['notNone'] = not nullAllowed
             if (defaultText):
                 # Strip ( and )