summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-06-09 12:18:35 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2015-06-09 12:18:35 -0400
commitc9712e4bd50f9a0c028e9b0f2ff994a75346e101 (patch)
tree39bee81110a9f2506871ffd1438ecce18285a65a
parent657be357de569ced699f44bdd96c6ba4e650b492 (diff)
parentd1dc39d55d111cdeffa663deec773d8bb67d237e (diff)
downloadsqlalchemy-c9712e4bd50f9a0c028e9b0f2ff994a75346e101.tar.gz
Merge remote-tracking branch 'origin/pr/180' into pr180
-rw-r--r--doc/build/orm/session_transaction.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/build/orm/session_transaction.rst b/doc/build/orm/session_transaction.rst
index 24a844650..08f11afcc 100644
--- a/doc/build/orm/session_transaction.rst
+++ b/doc/build/orm/session_transaction.rst
@@ -484,7 +484,9 @@ everything is rolled back.
from sqlalchemy import event
+
class SomeTest(TestCase):
+
def setUp(self):
# connect to the database
self.connection = engine.connect()
@@ -503,6 +505,6 @@ everything is rolled back.
def restart_savepoint(session, transaction):
if transaction.nested and not transaction._parent.nested:
session.begin_nested()
-
+ session.expire_all()
# ... the tearDown() method stays the same