From bdfac76483f2d6a3f0a945d0f9b60f821bd73766 Mon Sep 17 00:00:00 2001
From: Tomas Groth <second@tgc.dk>
Date: Tue, 25 Apr 2017 21:36:37 +0200
Subject: [PATCH] improve db cleanup

---
 openlp/core/lib/db.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py
index 7fcf0a808..3e2187b77 100644
--- a/openlp/core/lib/db.py
+++ b/openlp/core/lib/db.py
@@ -172,6 +172,7 @@ def upgrade_db(url, upgrade):
     else:
         version = int(version_meta.value)
     if version > upgrade.__version__:
+        session.remove()
         return version, upgrade.__version__
     version += 1
     try:
@@ -191,7 +192,7 @@ def upgrade_db(url, upgrade):
                 break
     except (SQLAlchemyError, DBAPIError):
         version_meta = Metadata.populate(key='version', value=int(upgrade.__version__))
-        session.remove()
+        session.commit()
     upgrade_version = upgrade.__version__
     version = int(version_meta.value)
     session.remove()