raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improve db cleanup

This commit is contained in:
Tomas Groth 2017-04-25 21:36:37 +02:00
parent e9e7285b8c
commit bdfac76483
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/core/lib/db.py
View File

@ -172,6 +172,7 @@ def upgrade_db(url, upgrade):
else: else:
version = int(version_meta.value) version = int(version_meta.value)
if version > upgrade.__version__: if version > upgrade.__version__:
session.remove()
return version, upgrade.__version__ return version, upgrade.__version__
version += 1 version += 1
try: try:
@ -191,7 +192,7 @@ def upgrade_db(url, upgrade):
break break
except (SQLAlchemyError, DBAPIError): except (SQLAlchemyError, DBAPIError):
version_meta = Metadata.populate(key='version', value=int(upgrade.__version__)) version_meta = Metadata.populate(key='version', value=int(upgrade.__version__))
session.remove() session.commit()
upgrade_version = upgrade.__version__ upgrade_version = upgrade.__version__
version = int(version_meta.value) version = int(version_meta.value)
session.remove() session.remove()