[Checkins] SVN: z3c.zalchemy/trunk/src/z3c/zalchemy/ Add encoding and convert_unicode to schema.

[Stefan H. Holek]

Log message for revision 72948:
  Add encoding and convert_unicode to schema.
  

Changed:
  U   z3c.zalchemy/trunk/src/z3c/zalchemy/datamanager.py
  U   z3c.zalchemy/trunk/src/z3c/zalchemy/interfaces.py

-=-
Modified: z3c.zalchemy/trunk/src/z3c/zalchemy/datamanager.py
===================================================================
--- z3c.zalchemy/trunk/src/z3c/zalchemy/datamanager.py	2007-03-01 16:23:16 UTC (rev 72947)
+++ z3c.zalchemy/trunk/src/z3c/zalchemy/datamanager.py	2007-03-01 16:44:59 UTC (rev 72948)
@@ -32,12 +32,14 @@
     """
     implements(IAlchemyEngineUtility)
 
-    def __init__(self, name, dsn, echo=False, **kwargs):
+    def __init__(self, name, dsn, echo=False, encoding='utf-8', convert_unicode=False, **kwargs):
         self.name = name
         # BBB: DSN is a field now and requires unicode
         if isinstance(dsn, str):
             dsn = unicode(dsn, errors='ignore')
         self.dsn = dsn
+        self.encoding = encoding
+        self.convert_unicode = convert_unicode
         self.echo = echo
         self.kw={}
         self.kw.update(kwargs)
@@ -52,6 +54,8 @@
         # create a new engine and store it thread local
         self.storage.engine = sqlalchemy.create_engine(self.dsn,
                                             echo=self.echo,
+                                            encoding=self.encoding,
+                                            convert_unicode=self.convert_unicode,
                                             **kw)
         return self.storage.engine
 

Modified: z3c.zalchemy/trunk/src/z3c/zalchemy/interfaces.py
===================================================================
--- z3c.zalchemy/trunk/src/z3c/zalchemy/interfaces.py	2007-03-01 16:23:16 UTC (rev 72947)
+++ z3c.zalchemy/trunk/src/z3c/zalchemy/interfaces.py	2007-03-01 16:44:59 UTC (rev 72948)
@@ -44,8 +44,18 @@
             required=True,
             default=u'sqlite://',
             )
+    encoding = schema.BytesLine(
+            title=u'Encoding',
+            required=True,
+            default='utf-8',
+            )
+    convert_unicode = schema.Bool(
+            title=u'Convert Unicode',
+            required=False,
+            default=False
+            )
     echo = schema.Bool(
-            title=u'echo sql',
+            title=u'Echo SQL',
             required=False,
             default=False
             )