[SQL-CVS] r1799 - SQLObject/trunk/sqlobject

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

Author: phd
Date: 2006-06-07 10:01:59 -0600 (Wed, 07 Jun 2006)
New Revision: 1799

Modified:
   SQLObject/trunk/sqlobject/main.py
Log:
A patch by Ivan Horvath <i.h...@al...>: convert unicode column names to ascii.


Modified: SQLObject/trunk/sqlobject/main.py
===================================================================
--- SQLObject/trunk/sqlobject/main.py	2006-06-07 16:01:26 UTC (rev 1798)
+++ SQLObject/trunk/sqlobject/main.py	2006-06-07 16:01:59 UTC (rev 1799)
@@ -432,6 +432,8 @@
         conn = connection or soClass._connection
         for columnDef in conn.columnsFromSchema(sqlmeta.table, soClass):
             if columnDef.name not in sqlmeta.columnDefinitions:
+                if isinstance(columnDef.name, unicode):
+                    columnDef.name = columnDef.name.encode('ascii')
                 sqlmeta.addColumn(columnDef)
 
     addColumnsFromDatabase = classmethod(addColumnsFromDatabase)
@@ -1233,6 +1235,7 @@
                     raise TypeError, "%s() did not get expected keyword argument %s" % (self.__class__.__name__, column.name)
                 # Otherwise we put it in as though they did pass
                 # that keyword:
+
                 kw[column.name] = default
 
         self.set(**kw)