This is an automated email from the ASF dual-hosted git repository.
johnbodley pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new 7a1aa79c52 fix: Ensure consistent rollback logic (#20811)
7a1aa79c52 is described below
commit 7a1aa79c52c7f5b69c222b8528ddd91f9ce44879
Author: John Bodley <[email protected]>
AuthorDate: Mon Jul 25 08:18:53 2022 -0700
fix: Ensure consistent rollback logic (#20811)
---
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 3b6e5e72e7..0c8a9e47c5 100644
--- a/superset/annotation_layers/annotations/dao.py
+++ b/superset/annotation_layers/annotations/dao.py
@@ -40,8 +40,7 @@ class AnnotationDAO(BaseDAO):
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 0ca19e2700..d9db4b582d 100644
--- a/superset/annotation_layers/dao.py
+++ b/superset/annotation_layers/dao.py
@@ -42,8 +42,7 @@ class AnnotationLayerDAO(BaseDAO):
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 0b6eee3ca0..384bd9a1fe 100644
--- a/superset/charts/dao.py
+++ b/superset/charts/dao.py
@@ -54,8 +54,7 @@ class ChartDAO(BaseDAO):
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 62b6843ce2..bc5006d58a 100644
--- a/superset/dashboards/dao.py
+++ b/superset/dashboards/dao.py
@@ -169,8 +169,7 @@ class DashboardDAO(BaseDAO):
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 48dc67d069..c6bcfa035c 100644
--- a/superset/queries/saved_queries/dao.py
+++ b/superset/queries/saved_queries/dao.py
@@ -42,6 +42,5 @@ class SavedQueryDAO(BaseDAO):
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 21b1473f32..f450c15375 100644
--- a/superset/reports/dao.py
+++ b/superset/reports/dao.py
@@ -111,8 +111,7 @@ class ReportScheduleDAO(BaseDAO):
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 @@ class ReportScheduleDAO(BaseDAO):
session.commit()
return row_count
except SQLAlchemyError as ex:
- if commit:
- session.rollback()
+ session.rollback()
raise DAODeleteFailedError(str(ex)) from ex
