diff options
Diffstat (limited to 'lib/sqlalchemy/orm/interfaces.py')
| -rw-r--r-- | lib/sqlalchemy/orm/interfaces.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/interfaces.py b/lib/sqlalchemy/orm/interfaces.py index 5dffa6774..eaafe5761 100644 --- a/lib/sqlalchemy/orm/interfaces.py +++ b/lib/sqlalchemy/orm/interfaces.py @@ -455,7 +455,7 @@ class MapperProperty(object): return not self.parent.non_primary - def merge(self, session, source, dest, dont_load, _recursive): + def merge(self, session, source, dest, load, _recursive): """Merge the attribute represented by this ``MapperProperty`` from source to destination object""" |