mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-27 14:30:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make updating of database structure always happen in the main thread

Browse Source 
Make sure the updating of the database structure always happens in the
main thread so it is in sync with the GUI updates. This way we know for
sure that the list of tables has been completely updated before we try
to (re-)select a table in the Browse Data tab after the DB structure
changed.

See issue #1701.
This commit is contained in:
Martin Kleusberg
2019-08-18 14:09:12 +02:00
parent f515c0473c
commit cf631a0222
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/MainWindow.cpp
View File

@@ -193,14 +193,10 @@ void MainWindow::init()
// Set up DB structure tab
dbStructureModel = new DbStructureModel(db, this);
connect(&db, &DBBrowserDB::structureUpdated, this, [this]() {
// TODO This needs to be a queued connection because the schema can be updated from different threads than the main thread.
// However, this makes calling this lambda asynchronous which can lead to unexpected results. One example is that opening a database,
// changing to the Browse Data tab, and then opening another database makes the table browser try to load the old table because the table
// list wasn't updated yet.
QString old_table = ui->comboBrowseTable->currentText();
dbStructureModel->reloadData();
populateStructure(old_table);
}, Qt::QueuedConnection);
});
ui->dbTreeWidget->setModel(dbStructureModel);
ui->dbTreeWidget->setColumnWidth(DbStructureModel::ColumnName, 300);
ui->dbTreeWidget->setColumnHidden(DbStructureModel::ColumnObjectType, true);
@@ -1546,6 +1542,9 @@ void MainWindow::executeQuery()
// existing execution area.
execute_sql_worker.reset(new RunSql(db, sql, execute_from_position, execute_to_position, true));
connect(execute_sql_worker.get(), &RunSql::structureUpdated, sqlWidget, [this]() {
db.updateSchema();
}, Qt::QueuedConnection);
connect(execute_sql_worker.get(), &RunSql::statementErrored, sqlWidget, [query_logger, this, sqlWidget](const QString& status_message, int from_position, int to_position) {
sqlWidget->getModel()->reset();
ui->actionSqlResultsSave->setEnabled(false);