From 2f7f6c699867dce1b19edab9c6ff9017e1a2250e Mon Sep 17 00:00:00 2001 From: John Bodley Date: Thu, 21 Jul 2022 10:50:04 -0700 Subject: [PATCH] fix: Ensure consistent rollback logic --- superset/annotation_layers/annotations/dao.py | 3 +-- superset/annotation_layers/dao.py | 3 +-- superset/charts/dao.py | 3 +-- superset/dashboards/dao.py | 3 +-- superset/queries/saved_queries/dao.py | 3 +-- superset/reports/dao.py | 6 ++---- 6 files changed, 7 insertions(+), 14 deletions(-) diff --git a/superset/annotation_layers/annotations/dao.py b/superset/annotation_layers/annotations/dao.py index 3b6e5e72e7099..0c8a9e47c5c06 100644 --- 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 index 0ca19e270091d..d9db4b582d97f 100644 --- 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 index 0b6eee3ca0ff6..384bd9a1fe6e2 100644 --- 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 index 62b6843ce2518..bc5006d58a083 100644 --- 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 index 48dc67d069db8..c6bcfa035ccea 100644 --- 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 index 21b1473f3281f..f450c153750fd 100644 --- 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