Try a more magical way of doing nested transactions

app/dao/dao_utils.py

@@ -1,16 +1,34 @@
 import itertools
+from contextlib import contextmanager
 from functools import wraps
 
 from app import db
 from app.history_meta import create_history
 
 
+@contextmanager
+def nested_transaction():
+    try:
+        db.session.begin_nested()
+        yield
+        db.session.commit()
+
+        if not db.session.registry().transaction.nested:
+            db.session.commit()
+    except Exception:
+        db.session.rollback()
+        raise
+
+
 def transactional(func):
     @wraps(func)
     def commit_or_rollback(*args, **kwargs):
         try:
             res = func(*args, **kwargs)
-            db.session.commit()
+
+            if not db.session.registry().transaction.nested:
+                db.session.commit()
+
             return res
         except Exception:
             db.session.rollback()
@@ -18,23 +36,6 @@ def transactional(func):
     return commit_or_rollback
 
 
-def nested_transactional(func):
-    # This creates a save point for the nested transaction.
-    # You must manage the commit or rollback from outer most call of the nested of the transactions.
-    @wraps(func)
-    def commit_or_rollback(*args, **kwargs):
-        try:
-            db.session.begin_nested()
-            res = func(*args, **kwargs)
-            db.session.commit()
-            return res
-        except Exception:
-            db.session.rollback()
-            raise
-
-    return commit_or_rollback
-
-
 class VersionOptions():
 
     def __init__(self, model_class, history_class=None, must_write_history=True):