diff options
| author | Diana Clarke <diana.joan.clarke@gmail.com> | 2016-04-05 18:58:21 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2016-04-06 13:28:25 -0400 |
| commit | bef15a950ec4140479bc244f9ca57b5da7c9bb3f (patch) | |
| tree | 79ed72593990bb7ba482fabed575aaa8acbd815b /lib/sqlalchemy/orm/properties.py | |
| parent | fdb6ab6a1d5d55d900c388e039835c6433032977 (diff) | |
| download | sqlalchemy-bef15a950ec4140479bc244f9ca57b5da7c9bb3f.tar.gz | |
- don't load deferred columns on unexpire for merge with load=False,
fixes #3488
Change-Id: Ic9577b800e4a4e2465ec7f3a2e95bd231f5337ee
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 |