diff options
Diffstat (limited to 'lib/sqlalchemy/orm/loading.py')
| -rw-r--r-- | lib/sqlalchemy/orm/loading.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/loading.py b/lib/sqlalchemy/orm/loading.py index 5ef2f10ec..d781df980 100644 --- a/lib/sqlalchemy/orm/loading.py +++ b/lib/sqlalchemy/orm/loading.py @@ -141,7 +141,7 @@ def merge_result(query, iterator, load=True): result = [] keys = [ent._label_name for ent in query._entities] keyed_tuple = result_tuple( - keys, [ent.entities for ent in query._entities] + keys, [tuple(ent.entities) for ent in query._entities] ) for row in iterator: newrow = list(row) @@ -528,7 +528,7 @@ def _instance_processor( if adapter: pk_cols = [adapter.columns[c] for c in pk_cols] - tuple_getter = result._tuple_getter(pk_cols, True) + tuple_getter = result._tuple_getter(pk_cols) if mapper.allow_partial_pks: is_not_primary_key = _none_set.issuperset |