[Checkins] SVN: z3c.sqlalchemy/trunk/ Merged r103334 from branch 1.3

[Vincent Fretin]

Log message for revision 103335:
  Merged r103334 from branch 1.3

Changed:
  U   z3c.sqlalchemy/trunk/CHANGES.txt
  U   z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/mapper.py

-=-
Modified: z3c.sqlalchemy/trunk/CHANGES.txt
===================================================================
--- z3c.sqlalchemy/trunk/CHANGES.txt	2009-08-28 14:12:01 UTC (rev 103334)
+++ z3c.sqlalchemy/trunk/CHANGES.txt	2009-08-28 14:18:10 UTC (rev 103335)
@@ -4,6 +4,17 @@
 - removed compatibility code with older Zope versions
 - fixed import issue with modern zope.component versions
 
+1.3.11 (unreleased)
+-------------------
+
+- When generating the mapper class, make sure table.name is a string.
+  It can be unicode when use_unicode=1 with MySQL engine.
+
+1.3.10 (04.08.2009)
+-------------------
+
+ - removed SA deprecation warning
+
 1.3.9 (06.01.2009)
 ------------------
 

Modified: z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/mapper.py
===================================================================
--- z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/mapper.py	2009-08-28 14:12:01 UTC (rev 103334)
+++ z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/mapper.py	2009-08-28 14:18:10 UTC (rev 103335)
@@ -112,7 +112,7 @@
         """ 
 
         if cls is None:
-            newCls = new.classobj('_mapped_%s' % table.name, (MappedClassBase,), {})
+            newCls = new.classobj('_mapped_%s' % str(table.name), (MappedClassBase,), {})
         else:
             newCls = cls