fix: Ensure consistent rollback logic (#20811)

apache · Jul 25, 2022 · 7a1aa79 · 7a1aa79
1 parent 0945d4a
commit 7a1aa79
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 14 deletions.
diff --git a/superset/annotation_layers/annotations/dao.py b/superset/annotation_layers/annotations/dao.py
@@ -40,8 +40,7 @@ def bulk_delete(models: Optional[List[Annotation]], commit: bool = True) -> None
             if commit:
                 db.session.commit()
         except SQLAlchemyError as ex:
-            if commit:
-                db.session.rollback()
+            db.session.rollback()
             raise DAODeleteFailedError() from ex
 
     @staticmethod

diff --git a/superset/annotation_layers/dao.py b/superset/annotation_layers/dao.py
@@ -42,8 +42,7 @@ def bulk_delete(
             if commit:
                 db.session.commit()
         except SQLAlchemyError as ex:
-            if commit:
-                db.session.rollback()
+            db.session.rollback()
             raise DAODeleteFailedError() from ex
 
     @staticmethod

diff --git a/superset/charts/dao.py b/superset/charts/dao.py
@@ -54,8 +54,7 @@ def bulk_delete(models: Optional[List[Slice]], commit: bool = True) -> None:
             if commit:
                 db.session.commit()
         except SQLAlchemyError as ex:
-            if commit:
-                db.session.rollback()
+            db.session.rollback()
             raise ex
 
     @staticmethod

diff --git a/superset/dashboards/dao.py b/superset/dashboards/dao.py
@@ -169,8 +169,7 @@ def bulk_delete(models: Optional[List[Dashboard]], commit: bool = True) -> None:
             if commit:
                 db.session.commit()
         except SQLAlchemyError as ex:
-            if commit:
-                db.session.rollback()
+            db.session.rollback()
             raise ex
 
     @staticmethod

diff --git a/superset/queries/saved_queries/dao.py b/superset/queries/saved_queries/dao.py
@@ -42,6 +42,5 @@ def bulk_delete(models: Optional[List[SavedQuery]], commit: bool = True) -> None
             if commit:
                 db.session.commit()
         except SQLAlchemyError as ex:
-            if commit:
-                db.session.rollback()
+            db.session.rollback()
             raise DAODeleteFailedError() from ex
diff --git a/superset/reports/dao.py b/superset/reports/dao.py
@@ -111,8 +111,7 @@ def bulk_delete(
             if commit:
                 db.session.commit()
         except SQLAlchemyError as ex:
-            if commit:
-                db.session.rollback()
+            db.session.rollback()
             raise DAODeleteFailedError(str(ex)) from ex
 
     @staticmethod
@@ -324,6 +323,5 @@ def bulk_delete_logs(
                 session.commit()
             return row_count
         except SQLAlchemyError as ex:
-            if commit:
-                session.rollback()
+            session.rollback()
             raise DAODeleteFailedError(str(ex)) from ex