QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-19 08:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Ensure consistent rollback logic (#20811)

Browse Source
This commit is contained in:
John Bodley
2022-07-25 08:18:53 -07:00
committed by GitHub
parent 0945d4a2f4
commit 7a1aa79c52
6 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
superset/annotation_layers/annotations/dao.py
View File

@@ -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

3
superset/annotation_layers/dao.py
View File

@@ -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

3
superset/charts/dao.py
View File

@@ -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

3
superset/dashboards/dao.py
View File

@@ -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

3
superset/queries/saved_queries/dao.py
View File

@@ -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

6
superset/reports/dao.py
View File

@@ -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