diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-11-02 18:05:06 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-11-02 18:05:06 +0000 |
| commit | d355ea021dc51f4765524ec24f78dd03a7be8d8a (patch) | |
| tree | 7dcc351468f5912ab45ef17ac46af36a2942c29e /lib/sqlalchemy/orm/session.py | |
| parent | 4161271a8c44c2392d8fc09a91391d6b0619dc9c (diff) | |
| download | sqlalchemy-d355ea021dc51f4765524ec24f78dd03a7be8d8a.tar.gz | |
- extra merge test
- merge with dont_load also propagates _state.modified
Diffstat (limited to 'lib/sqlalchemy/orm/session.py')
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index 30e97eba7..0b5744778 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -879,6 +879,8 @@ class Session(object): raise exceptions.AssertionError("Instance %s has an instance key but is not persisted" % mapperutil.instance_str(object)) for prop in mapper.iterate_properties: prop.merge(self, object, merged, dont_load, _recursive) + if dont_load: + merged._state.modified = object._state.modified if key is None: self.save(merged, entity_name=mapper.entity_name) return merged |