Properly rollback failed db commits

redash/handlers/dashboards.py

@@ -18,6 +18,7 @@
 )
 from redash.security import csp_allows_embeding
 from redash.serializers import serialize_dashboard
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm.exc import StaleDataError
 
 
@@ -215,7 +216,11 @@ def post(self, dashboard_slug):
         try:
             models.db.session.commit()
         except StaleDataError:
+            models.db.session.rollback()
             abort(409)
+        except IntegrityError:
+            models.db.session.rollback()
+            abort(400)
 
         result = serialize_dashboard(
             dashboard, with_widgets=True, user=self.current_user

redash/handlers/data_sources.py

@@ -69,6 +69,7 @@ def post(self, data_source_id):
         try:
             models.db.session.commit()
         except IntegrityError as e:
+            models.db.session.rollback()
             if req["name"] in str(e):
                 abort(
                     400,
@@ -159,6 +160,7 @@ def post(self):
 
             models.db.session.commit()
         except IntegrityError as e:
+            models.db.session.rollback()
             if req["name"] in str(e):
                 abort(
                     400,

redash/handlers/users.py

@@ -157,6 +157,7 @@ def post(self):
             models.db.session.add(user)
             models.db.session.commit()
         except IntegrityError as e:
+            models.db.session.rollback()
             if "email" in str(e):
                 abort(400, message="Email already taken.")
             abort(500)
@@ -287,7 +288,7 @@ def post(self, user_id):
                 message = "Email already taken."
             else:
                 message = "Error updating record"
-
+            models.db.session.rollback()
             abort(400, message=message)
 
         self.record_event(