aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@qt.io>2022-06-13 16:47:17 +0200
committerTim Jenssen <tim.jenssen@qt.io>2022-06-21 13:52:00 +0000
commit20bc8b8243ef24a4018096527ab2b0941767d056 (patch)
tree3741110b2d5955dde2f8f93dc20a639a84c9c3b1
parent281c5348944a1a32aae2582a7712ac98a6b00061 (diff)
QmlDesigner: Install busy handler for every database access
Even for pragma changes the statement can be getting busy. To prevent any exceptions in that case we set the busy handler directly after opening the database. Change-Id: Id10aab20d812d5224f8031fa895c396762858fdf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--src/libs/sqlite/sqlitedatabase.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/sqlite/sqlitedatabase.cpp b/src/libs/sqlite/sqlitedatabase.cpp
index 5e72d6660e..96e6a87b8a 100644
--- a/src/libs/sqlite/sqlitedatabase.cpp
+++ b/src/libs/sqlite/sqlitedatabase.cpp
@@ -93,12 +93,12 @@ void Database::activateLogging()
void Database::open(LockingMode lockingMode)
{
m_databaseBackend.open(m_databaseFilePath, m_openMode);
- m_databaseBackend.setLockingMode(lockingMode);
- m_databaseBackend.setJournalMode(m_journalMode);
if (m_busyTimeout > 0ms)
m_databaseBackend.setBusyTimeout(m_busyTimeout);
else
m_databaseBackend.registerBusyHandler();
+ m_databaseBackend.setLockingMode(lockingMode);
+ m_databaseBackend.setJournalMode(m_journalMode);
registerTransactionStatements();
m_isOpen = true;
}