]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
- merge hybrid attributes branch, [ticket:1903]
authorMike Bayer <mike_mp@zzzcomputing.com>
Sat, 20 Nov 2010 17:55:46 +0000 (12:55 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Sat, 20 Nov 2010 17:55:46 +0000 (12:55 -0500)
commitc5442b3adb56cae15607aad32b4219ac11ae809e
tree0502f97a14672dd089adab6184681cb7a0f3bfea
parentd505ea71aed44ecae718052131dc0a2fb2c9dd99
parent6dbf2c3314a797a39624f1e68569bfbbb2b6ac87
- merge hybrid attributes branch, [ticket:1903]
lib/sqlalchemy/orm/attributes.py
lib/sqlalchemy/orm/dynamic.py
lib/sqlalchemy/orm/interfaces.py
lib/sqlalchemy/orm/mapper.py
lib/sqlalchemy/orm/query.py
lib/sqlalchemy/orm/strategies.py
lib/sqlalchemy/orm/util.py
test/orm/test_mapper.py