summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/dynamic.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/orm/dynamic.py')
-rw-r--r--lib/sqlalchemy/orm/dynamic.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/dynamic.py b/lib/sqlalchemy/orm/dynamic.py
index 4637bad7e..2094b1cb0 100644
--- a/lib/sqlalchemy/orm/dynamic.py
+++ b/lib/sqlalchemy/orm/dynamic.py
@@ -144,9 +144,11 @@ class DynamicAttributeImpl(attributes.AttributeImpl):
def get_all_pending(self, state, dict_):
c = self._get_collection_history(state, True)
- return (c.added_items or []) +\
- (c.unchanged_items or []) +\
- (c.deleted_items or [])
+ return [
+ (attributes.instance_state(x), x)
+ for x in
+ c.added_items + c.unchanged_items + c.deleted_items
+ ]
def _get_collection_history(self, state, passive=False):
if self.key in state.committed_state: