]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
merge -r5936:5974 of trunk
authorMike Bayer <mike_mp@zzzcomputing.com>
Mon, 25 May 2009 15:20:44 +0000 (15:20 +0000)
committerMike Bayer <mike_mp@zzzcomputing.com>
Mon, 25 May 2009 15:20:44 +0000 (15:20 +0000)
commit10640dba13748a50d2cad34962094553b33f7d19
tree7c9b64068ff2bf4bb09dfd1a589de302f2cb39db
parentb47d40e8933d76b36e3bb991850cdaf6ea6e0f75
merge -r5936:5974 of trunk
36 files changed:
CHANGES
doc/build/sqlexpression.rst
lib/sqlalchemy/__init__.py
lib/sqlalchemy/dialects/mysql/base.py
lib/sqlalchemy/dialects/sqlite/base.py
lib/sqlalchemy/exc.py
lib/sqlalchemy/orm/attributes.py
lib/sqlalchemy/orm/collections.py
lib/sqlalchemy/orm/dependency.py
lib/sqlalchemy/orm/dynamic.py
lib/sqlalchemy/orm/identity.py
lib/sqlalchemy/orm/interfaces.py
lib/sqlalchemy/orm/mapper.py
lib/sqlalchemy/orm/properties.py
lib/sqlalchemy/orm/query.py
lib/sqlalchemy/orm/session.py
lib/sqlalchemy/orm/state.py [new file with mode: 0644]
lib/sqlalchemy/orm/strategies.py
lib/sqlalchemy/orm/sync.py
lib/sqlalchemy/orm/unitofwork.py
lib/sqlalchemy/sql/expression.py
lib/sqlalchemy/sql/util.py
test/dialect/sqlite.py
test/orm/attributes.py
test/orm/extendedattr.py
test/orm/inheritance/basic.py
test/orm/instrumentation.py
test/orm/mapper.py
test/orm/merge.py
test/orm/naturalpks.py
test/orm/onetoone.py
test/orm/query.py
test/orm/relationships.py
test/orm/session.py
test/orm/unitofwork.py
test/profiling/zoomark_orm.py