diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-05-08 16:09:48 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-05-08 16:09:48 -0400 |
| commit | 6ea6673376609ce6a5e26f9f20425cffee96bcd8 (patch) | |
| tree | 937024d0317d18d6fdffbbca7ee32b2449162242 /lib/sqlalchemy/orm/util.py | |
| parent | 7009a3bc32daadf078e2806622615c665105240e (diff) | |
| download | sqlalchemy-6ea6673376609ce6a5e26f9f20425cffee96bcd8.tar.gz | |
- session.merge() will not expire attributes on the returned
instance if that instance is "pending". [ticket:1789]
Diffstat (limited to 'lib/sqlalchemy/orm/util.py')
| -rw-r--r-- | lib/sqlalchemy/orm/util.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py index 03f8c0c37..651b0256b 100644 --- a/lib/sqlalchemy/orm/util.py +++ b/lib/sqlalchemy/orm/util.py @@ -612,10 +612,7 @@ def _class_to_mapper(class_or_mapper, compile=True): def has_identity(object): state = attributes.instance_state(object) - return _state_has_identity(state) - -def _state_has_identity(state): - return bool(state.key) + return state.has_identity def _is_mapped_class(cls): global mapperlib |