diff options
| author | Diana Clarke <diana.joan.clarke@gmail.com> | 2016-04-05 18:58:21 -0400 |
|---|---|---|
| committer | Diana Clarke <diana.joan.clarke@gmail.com> | 2016-04-05 18:58:21 -0400 |
| commit | 0f502fa418e32177ae139afb7a816ff849baeef5 (patch) | |
| tree | 86b8976d11669f94828631a67d5f565cac765a8f /lib/sqlalchemy/orm/properties.py | |
| parent | fdb6ab6a1d5d55d900c388e039835c6433032977 (diff) | |
| download | sqlalchemy-pr/256.tar.gz | |
- don't load deferred columns on unexpire for merge with load=False,pr/256
fixes #3488
Co-Authored-By: Mike Bayer <mike_mp@zzzcomputing.com>
Diffstat (limited to 'lib/sqlalchemy/orm/properties.py')
| -rw-r--r-- | lib/sqlalchemy/orm/properties.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py index 8197e041f..f3dce7541 100644 --- a/lib/sqlalchemy/orm/properties.py +++ b/lib/sqlalchemy/orm/properties.py @@ -218,7 +218,8 @@ class ColumnProperty(StrategizedProperty): impl = dest_state.get_impl(self.key) impl.set(dest_state, dest_dict, value, None) elif dest_state.has_identity and self.key not in dest_dict: - dest_state._expire_attributes(dest_dict, [self.key]) + dest_state._expire_attributes( + dest_dict, [self.key], no_loader=True) class Comparator(util.MemoizedSlots, PropComparator): """Produce boolean, comparison, and other operators for |