openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Create a connection and then run execute

This commit is contained in:
Raoul Snyman 2023-07-14 07:30:46 -07:00
parent 14d3eff0bb
commit 58076ace93
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openlp/core/db/manager.py
View File

@ -315,11 +315,10 @@ class DBManager(object):
"""
VACUUM the database on exit.
"""
if self.is_dirty:
engine = create_engine(self.db_url)
if self.db_url.startswith('sqlite'):
try:
engine.execute("vacuum")
except OperationalError:
# Just ignore the operational error
pass
if self.is_dirty and self.db_url.startswith('sqlite'):
try:
engine = create_engine(self.db_url)
engine.connect().execute("vacuum")
except OperationalError:
# Just ignore the operational error
pass

6
tests/openlp_core/db/test_manager.py
View File

@ -40,7 +40,7 @@ def test_manager_finalise_exception(mocked_create_engine, mocked_init_url, temp_
def init_schema(url):
return mocked_session
mocked_create_engine.return_value.execute.side_effect = SQLAlchemyOperationalError(
mocked_create_engine.return_value.connect.return_value.execute.side_effect = SQLAlchemyOperationalError(
statement='vacuum',
params=[],
orig=SQLiteOperationalError('database is locked')
@ -52,7 +52,7 @@ def test_manager_finalise_exception(mocked_create_engine, mocked_init_url, temp_
manager.finalise()
# THEN: vacuum should have been called on the database
mocked_create_engine.return_value.execute.assert_called_once_with('vacuum')
mocked_create_engine.return_value.connect.return_value.execute.assert_called_once_with('vacuum')
@patch('openlp.core.db.manager.init_url')
@ -73,4 +73,4 @@ def test_manager_finalise(mocked_create_engine, mocked_init_url, temp_folder, se
manager.finalise()
# THEN: vacuum should have been called on the database
mocked_create_engine.return_value.execute.assert_called_once_with('vacuum')
mocked_create_engine.return_value.connect.return_value.execute.assert_called_once_with('vacuum')