]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
- merge 00380cf3c304ea7f1c7397f17b828166364c36ac from default
authorMike Bayer <mike_mp@zzzcomputing.com>
Wed, 18 May 2011 16:12:00 +0000 (12:12 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Wed, 18 May 2011 16:12:00 +0000 (12:12 -0400)
commit94fc44ac020da38e29340955e9cb696133080a03
tree189b989905a8e9f1ed0f7ad86770f0ef967b115e
parent05a8fd48a3385839bbe4a7838ea018472e98f5af
- merge 00380cf3c304ea7f1c7397f17b828166364c36ac from default
- Fixed bug whereby nesting a label of a select()
with another label in it would produce incorrect
exported columns.   Among other things this would
break an ORM column_property() mapping against
another column_property().  [ticket:2167].
CHANGES
lib/sqlalchemy/orm/query.py
lib/sqlalchemy/sql/expression.py
test/orm/test_query.py
test/sql/test_selectable.py