expunge_all() before commit in atomic

epandurski · Feb 10, 2019 · 5c44e77 · 5c44e77
1 parent 9e4701c
commit 5c44e77
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/flask_signalbus/atomic.py b/flask_signalbus/atomic.py
@@ -113,6 +113,8 @@ def wrapper(*args, **kwargs):
             session_info[_ATOMIC_FLAG_SESSION_INFO_KEY] = True
             try:
                 result = f(*args, **kwargs)
+                session.flush()
+                session.expunge_all()
                 session.commit()
                 return result
             except Exception:

diff --git a/tests/test_atomic.py b/tests/test_atomic.py
@@ -82,8 +82,11 @@ def test_retry_on_integrity_error(atomic_db, AtomicModel):
     @db.execute_atomic
     def t1():
         with db.retry_on_integrity_error():
-            db.session.merge(o)
+            return db.session.merge(o)
     assert len(AtomicModel.query.all()) == 1
+    assert t1 not in db.session
+    assert t1.name == 'test'
+    assert t1.value == '1'
 
     db.session.expunge_all()
     o.value = '2'