Changeset 3408

Show
Ignore:
Timestamp:
08/18/07 10:59:09 (1 year ago)
Author:
paj
Message:

Merge [3407] into 1.1 branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.1/turbogears/database.py

    r3406 r3408  
    5151        if not metadata.is_bound(): 
    5252            bind_meta_data() 
    53         return sqlalchemy.create_session() 
     53        return sqlalchemy.orm.create_session() 
    5454 
    5555    metadata = activemapper.metadata 

  • branches/1.1/turbogears/tests/test_sqlalchemy.py

    r3406 r3408  
    11"Tests for SQLAlchemy support" 
    22 
    3 import cherrypy 
     3import cherrypy, os, threading 
    44 
    55from sqlalchemy import * 
     6from sqlalchemy.orm import * 
    67from sqlalchemy.ext.activemapper import ActiveMapper, column, one_to_many 
    78 
    …… 
    1617bind_meta_data() 
    1718 
    18 metadata.engine.echo = True 
     19metadata.bind.echo = True 
    1920 
    2021users_table = Table("users", metadata, 
    …… 
    119120    # IntegrityError depending on what version of sqlite and pysqlite 
    120121    # is used. 
    121     assert "SQLError" in output 
     122    # SA 0.3 uses SQLError; 0.4 DBAPIError 
     123    assert "SQLError" in output or "DBAPIError" in output 
    122124    assert cherrypy.response.code == 501 
    123125 
    …… 
    155157    fresh_md.bind = 'sqlite:///freshtest.db' # :memory: can't be used in multiple threads 
    156158    test_table.create() 
    157     fresh_md.engine.execute(test_table.insert(), dict(id=1, val='a')) 
     159    fresh_md.bind.execute(test_table.insert(), dict(id=1, val='a')) 
    158160 
    159161    cherrypy.root = FreshRoot() 

  • branches/1.1/turbogears/testutil.py

    r2866 r3408  
    256256def sqlalchemy_cleanup(): 
    257257    database._engine = None 
    258     sqlalchemy.clear_mappers() 
     258    sqlalchemy.orm.clear_mappers() 
    259259    database.metadata.clear() 
    260260    database.metadata.dispose()