Skip to content

Commit

Permalink
re-added changes from 1.0.11
Browse files Browse the repository at this point in the history
  • Loading branch information
zopyx committed May 4, 2008
1 parent 0a4de6d commit 33017b0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/z3c/sqlalchemy/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def __init__(self, dsn, model=None, transactional=True, **kw):
@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
Expand Down
4 changes: 2 additions & 2 deletions src/z3c/sqlalchemy/mapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -97,7 +97,7 @@ def __init__(self, wrapper):
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()
Expand Down

0 comments on commit 33017b0

Please sign in to comment.