properly rollback failed db commits

mozilla · Aug 16, 2018 · 6f3d513 · 6f3d513
1 parent 16846d7
commit 6f3d513
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/redash/handlers/dashboards.py b/redash/handlers/dashboards.py
@@ -10,6 +10,7 @@
 from redash.permissions import (can_modify, require_admin_or_owner,
                                 require_object_modify_permission,
                                 require_permission)
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm.exc import StaleDataError
 
 
@@ -127,7 +128,7 @@ def post(self, dashboard_slug):
 
         require_object_modify_permission(dashboard, self.current_user)
 
-        updates = project(dashboard_properties, ('name', 'layout', 'version', 'tags', 
+        updates = project(dashboard_properties, ('name', 'layout', 'version', 'tags',
                                                  'is_draft', 'dashboard_filters_enabled'))
 
         # SQLAlchemy handles the case where a concurrent transaction beats us
@@ -143,7 +144,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)
         self.record_event({

diff --git a/redash/handlers/data_sources.py b/redash/handlers/data_sources.py
@@ -54,6 +54,7 @@ def post(self, data_source_id):
         try:
             models.db.session.commit()
         except IntegrityError as e:
+            models.db.session.rollback()
             if req['name'] in e.message:
                 abort(400, message="Data source with the name {} already exists.".format(req['name']))
 
@@ -127,6 +128,7 @@ def post(self):
 
             models.db.session.commit()
         except IntegrityError as e:
+            models.db.session.rollback()
             if req['name'] in e.message:
                 abort(400, message="Data source with the name {} already exists.".format(req['name']))
 

diff --git a/redash/handlers/users.py b/redash/handlers/users.py
@@ -92,6 +92,7 @@ def post(self):
             models.db.session.add(user)
             models.db.session.commit()
         except IntegrityError as e:
+            models.db.session.rollback()
             if "email" in e.message:
                 abort(400, message='Email already taken.')
             abort(500)
@@ -179,7 +180,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({