Changeset 3004

Show
Ignore:
Timestamp:
05/05/07 06:42:41 (2 years ago)
Author:
alberto
Message:

merged 3002:3003 from 1.0

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG.txt

    r2992 r3004  
    2323*Changes* 
    2424 
     25* Added support for multiple databases using SA. #1380 by Ian Charnas. 
     26 
    2527*Features* 
    2628 
    …… 
    3133*Contributors* 
    3234 
     35Ian Charnas. 
    3336 
    34371.0.2 (May 2, 2007): 

  • trunk/turbogears/database.py

    r2881 r3004  
    4545        return _engine 
    4646 
    47     def create_session(): 
    48         "Creates a session with the appropriate engine" 
    49         return sqlalchemy.create_session(bind_to=get_engine()) 
    50  
    5147    metadata = activemapper.metadata 
    52     session = activemapper.Objectstore(create_session) 
     48    session = activemapper.Objectstore(sqlalchemy.create_session) 
    5349    activemapper.objectstore = session 
    5450