Merge pull request #2777 from chaoss/fix-session-rollback

Rollback transaction when query throws exception

augur/application/db/models/augur_data.py

@@ -878,7 +878,13 @@ class Repo(Base):
     @staticmethod
     def get_by_id(session, repo_id):
 
-        return session.query(Repo).filter(Repo.repo_id == repo_id).first()
+        try:
+            return session.query(Repo).filter(Repo.repo_id == repo_id).first()
+        except Exception as e:
+            session.rollback()
+            raise e
+
+
 
     @staticmethod
     def get_by_repo_git(session, repo_git):

augur/application/db/models/augur_operations.py

@@ -329,6 +329,9 @@ def get_user(session, username: str):
             return user
         except NoResultFound:
             return None
+        except Exception as e:
+            session.rollback()
+            raise e
 
     @staticmethod
     def get_by_id(session, user_id: int):
@@ -1073,7 +1076,13 @@ def __eq__(self, other):
 
     @staticmethod
     def get_by_id(session, client_id):
-        return session.query(ClientApplication).filter(ClientApplication.id == client_id).first()
+
+        try:
+            return session.query(ClientApplication).filter(ClientApplication.id == client_id).first()
+        except Exception as e:
+            session.rollback()
+            raise e
+
 
 class Subscription(Base):
     __tablename__ = "subscriptions"