Merged r103334 from branch 1.3

zopefoundation · Aug 28, 2009 · a113b27 · a113b27
1 parent 5b8d18f
commit a113b27
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -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)
 ------------------
 

diff --git a/src/z3c/sqlalchemy/mapper.py b/src/z3c/sqlalchemy/mapper.py
@@ -112,7 +112,7 @@ class (will be autogenerated if not available).
         """ 
 
         if cls is None:
-            newCls = new.classobj('_mapped_%s' % table.name, (MappedClassBase,), {})
+            newCls = new.classobj('_mapped_%s' % str(table.name), (MappedClassBase,), {})
         else:
             newCls = cls