]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
- Repaired the usage of merge() when used with
authorMike Bayer <mike_mp@zzzcomputing.com>
Sun, 1 Aug 2010 18:07:35 +0000 (14:07 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Sun, 1 Aug 2010 18:07:35 +0000 (14:07 -0400)
commit6d1bb27a33008ac49494ec4a6f8e84729ce1e2e7
tree89e76c588f2cb2c95d0e269b215d5412ce249358
parent2159753bfc11d7188a287faf1be7fdf4762f0efa
- Repaired the usage of merge() when used with
concrete inheriting mappers.  Such mappers frequently
have so-called "concrete" attributes, which are
subclass attributes that "disable" propagation from
the parent - these needed to allow a merge()
operation to pass through without effect.
CHANGES
lib/sqlalchemy/orm/interfaces.py
lib/sqlalchemy/orm/properties.py
test/orm/inheritance/test_concrete.py