summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/session.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-07-01 12:12:27 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-07-01 12:12:51 -0400
commit427ee3a61e9732fe41c10d2f8ab6650f24bb3d7c (patch)
treee480ee7e5f51aaa998e32fb9c15fa3fa81c61307 /lib/sqlalchemy/orm/session.py
parent2d8d1dcf60e023275b8dcfea015ec16cad69d266 (diff)
downloadsqlalchemy-427ee3a61e9732fe41c10d2f8ab6650f24bb3d7c.tar.gz
- Fixed bug where items that were persisted, deleted, or had a
primary key change within a savepoint block would not participate in being restored to their former state (not in session, in session, previous PK) after the outer transaction were rolled back. fixes #3108
Diffstat (limited to 'lib/sqlalchemy/orm/session.py')
-rw-r--r--lib/sqlalchemy/orm/session.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 3cc03a2d4..714c42a84 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -292,7 +292,10 @@ class SessionTransaction(object):
for s in self._deleted:
s.session_id = None
self._deleted.clear()
-
+ elif self.nested:
+ self._parent._new.update(self._new)
+ self._parent._deleted.update(self._deleted)
+ self._parent._key_switches.update(self._key_switches)
def _connection_for_bind(self, bind):
self._assert_active()