[Checkins] SVN: z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/ fix usage of forZope=True for a non-postgres DSN

[Andreas Jung]

Log message for revision 74847:
  fix usage of forZope=True for a non-postgres DSN
  

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

-=-
Modified: z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/CHANGES.txt
===================================================================
--- z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/CHANGES.txt	2007-04-27 05:13:08 UTC (rev 74846)
+++ z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/CHANGES.txt	2007-04-27 05:19:55 UTC (rev 74847)
@@ -4,6 +4,11 @@
      we don't need. It can be defined within the model using a
      PrimaryKeyConstraint()
 
+   - createSAWrapper: setting forZope=True for a non-postgres DSN
+     now also returns a Zope-aware wrapper instance (instead
+     of a BaseWrapper instance).  (Reported by Martin Aspeli)
+
+
 0.1.9 (26.04.2007)
 
    - base.py: the 'model' parameter can now also be a callable

Modified: z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/util.py
===================================================================
--- z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/util.py	2007-04-27 05:13:08 UTC (rev 74846)
+++ z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/util.py	2007-04-27 05:19:55 UTC (rev 74847)
@@ -31,13 +31,13 @@
 def createSQLAlchemyWrapper(dsn, model=None, forZope=False, **kw):
     """ Convenience method to generate a wrapper for a DSN and a model.
         This method hides all database related magic from the user. 
-        Set 'forZope' to True for a Zope related wrapper.
+        Set 'forZope' to True to obtain a Zope-aware wrapper.
     """
 
     url = make_url(dsn)
     driver = url.drivername
 
-    klass = BaseWrapper
+    klass = forZope and ZopeBaseWrapper or BaseWrapper
 
     if driver == 'postgres':
         klass = forZope and ZopePostgresWrapper or PythonPostgresWrapper
@@ -110,7 +110,7 @@
     for name, wrapper in getUtilitiesFor(ISQLAlchemyWrapper):
         yield {'name' : name,
                'dsn' : wrapper.dsn,
-               'echo' : wrapper.echo,
+               'kw' : wrapper.kw,
               }
 
 allRegisteredSAWrappers = allRegisteredSQLAlchemyWrappers