summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/session.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 5583012e5..c34a695e3 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -250,17 +250,9 @@ class SessionTransaction(object):
self._deleted = self._parent._deleted
return
- if self.nested:
+ if self.autoflush:
self.session.flush()
- if self.autoflush and not self.session.autocommit:
- # TODO: the "dirty_states" assertion is expensive,
- # so consider these assertions as temporary
- # during development
- assert not self.session._new
- assert not self.session._deleted
- assert not self.session._dirty_states
-
self._new = weakref.WeakKeyDictionary()
self._deleted = weakref.WeakKeyDictionary()