mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 02:50:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible 'database locked' error when detaching a database

Browse Source 
Revert the savepoint in the Execute SQL whenever possible. We need to
do this after each statement because there are some rare cases where
the next statement might be affected by what is only a temporary and
unnecessary savepoint. For example in this case:

ATTACH 'xxx' AS 'db2'
SELECT * FROM db2.xy;    -- Savepoint created here
DETACH db2;              -- Savepoint makes this statement fail

See issue #1249.
This commit is contained in:
Martin Kleusberg
2018-01-15 23:51:30 +01:00
parent 012ad9217a
commit 404f48c5a9
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/MainWindow.cpp
View File

@@ -1216,6 +1216,17 @@ void MainWindow::executeQuery()
execution_start_index = execution_end_index;
// Revert to save point now if it wasn't needed. We need to do this here because there are some rare cases where the next statement might
// be affected by what is only a temporary and unnecessary savepoint. For example in this case:
// ATTACH 'xxx' AS 'db2'
// SELECT * FROM db2.xy; -- Savepoint created here
// DETACH db2; -- Savepoint makes this statement fail
if(!modified && !wasdirty && savepoint_created)
{
db.revertToSavepoint(); // better rollback, if the logic is not enough we can tune it.
savepoint_created = false;
}
// Process events to keep the UI responsive
qApp->processEvents();
}
@@ -1225,9 +1236,6 @@ void MainWindow::executeQuery()
connect(sqlWidget->getTableResult(), &ExtendedTableWidget::activated, this, &MainWindow::dataTableSelectionChanged);
connect(sqlWidget->getTableResult(), SIGNAL(doubleClicked(QModelIndex)), this, SLOT(doubleClickTable(QModelIndex)));
if(!modified && !wasdirty && savepoint_created)
db.revertToSavepoint(); // better rollback, if the logic is not enough we can tune it.
// If the DB structure was changed by some command in this SQL script, update our schema representations
if(structure_updated)
db.updateSchema();