Ticket #1483: TurboGears-1.0.3.2dev_r3487_database.py.diff
| File TurboGears-1.0.3.2dev_r3487_database.py.diff, 1.0 kB (added by renier, 11 months ago) |
|---|
-
database.py
old new 27 27 # Provide support for sqlalchemy 28 28 try: 29 29 import sqlalchemy 30 from sqlalchemy.ext import activemapper, sessioncontext30 import elixir 31 31 from sqlalchemy.exceptions import InvalidRequestError 32 32 33 33 def get_engine(): … … 58 58 59 59 return sqlalchemy.orm.create_session() 60 60 61 metadata = activemapper.metadata 62 session = activemapper.Objectstore(create_session) 63 activemapper.objectstore = session 61 metadata = elixir.metadata 62 session = elixir.objectstore 64 63 65 64 def bind_meta_data(): 66 65 get_engine() … … 384 383 req = cherrypy.request 385 384 if hasattr(req, 'sa_transaction') and req.sa_transaction.session.transaction: 386 385 req.sa_transaction.rollback() 387 del session.context.current386 session.context.registry.clear() 388 387 req.sa_transaction = session.create_transaction() 389 388 390 389 def so_to_dict(sqlobj):
