[Checkins] SVN: z3c.sqlalchemy/branches/1.0/src/z3c/sqlalchemy/ re-added changes from 1.0.11

[Andreas Jung]

Log message for revision 86415:
  re-added changes from 1.0.11
  

Changed:
  U   z3c.sqlalchemy/branches/1.0/src/z3c/sqlalchemy/base.py
  U   z3c.sqlalchemy/branches/1.0/src/z3c/sqlalchemy/mapper.py

-=-
Modified: z3c.sqlalchemy/branches/1.0/src/z3c/sqlalchemy/base.py
===================================================================
--- z3c.sqlalchemy/branches/1.0/src/z3c/sqlalchemy/base.py	2008-05-04 19:23:30 UTC (rev 86414)
+++ z3c.sqlalchemy/branches/1.0/src/z3c/sqlalchemy/base.py	2008-05-04 19:24:05 UTC (rev 86415)
@@ -108,7 +108,7 @@
     @property
     def metadata(self):
         if not hasattr(self, '_v_metadata'):
-            self._v_metadata = sqlalchemy.BoundMetaData(self._engine)
+            self._v_metadata = sqlalchemy.MetaData(self._engine)
         return self._v_metadata
 
     @property

Modified: z3c.sqlalchemy/branches/1.0/src/z3c/sqlalchemy/mapper.py
===================================================================
--- z3c.sqlalchemy/branches/1.0/src/z3c/sqlalchemy/mapper.py	2008-05-04 19:23:30 UTC (rev 86414)
+++ z3c.sqlalchemy/branches/1.0/src/z3c/sqlalchemy/mapper.py	2008-05-04 19:24:05 UTC (rev 86415)
@@ -14,7 +14,7 @@
 import new
 import threading
 
-from sqlalchemy import Table, mapper, BoundMetaData, relation, class_mapper
+from sqlalchemy import Table, mapper, MetaData, relation, class_mapper
 
 marker = object
 
@@ -97,7 +97,7 @@
         self._wrapper = wrapper
         self._engine = wrapper.engine
         self._model = wrapper.model or {}
-        self._metadata = BoundMetaData(self._engine)
+        self._metadata = MetaData(self._engine)
         self._mapper_factory = MapperFactory(self._metadata)
         self._dependent_tables = None
         self._lock = threading.Lock()