Clear Table Browser settings when the table does not exist any longer

mgrojo · mgrojo · commit fdc4169fb9fe · 2024-06-21T21:52:54.000+02:00
For example, when a database is detached. See issue #3662
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -671,14 +671,14 @@ void MainWindow::populateStructure(const std::vector<sqlb::ObjectIdentifier>& ol
     ui->treeSchemaDock->resizeColumnToContents(DbStructureModel::ColumnName);
 }
 
-void MainWindow::refreshTableBrowsers()
+void MainWindow::refreshTableBrowsers(bool all)
 {
     QApplication::setOverrideCursor(Qt::WaitCursor);
     for(const auto& d : allTableBrowserDocks())
     {
         // When in the Browse Data tab update all docks. Otherwise just update the floating ones because they might
         // be visible even when another tab is active.
-        if(ui->mainTab->currentWidget() == ui->browser || d->isFloating())
+        if(all || ui->mainTab->currentWidget() == ui->browser || d->isFloating())
         {
             TableBrowser* t = d->tableBrowser();
             if(t)
@@ -3402,6 +3402,8 @@ void MainWindow::fileDetachTreeViewSelected(QTreeView* treeView)
     std::string attached_as = treeView->model()->data(treeView->currentIndex().sibling(treeView->currentIndex().row(), DbStructureModel::ColumnSchema), Qt::EditRole).toString().toStdString();
     if (db.detach(attached_as))
     {
+        db.updateSchema();
+        refreshTableBrowsers(/* all */ true);
         isProjectModified = true;
     }
 }
diff --git a/src/MainWindow.h b/src/MainWindow.h
@@ -175,7 +175,8 @@ private slots:
     void changeTreeSelection();
     void fileNew();
     void fileNewInMemoryDatabase(bool open_create_dialog = true);
-    void refreshTableBrowsers();
+    // Refresh visible table browsers. When all is true, refresh all browsers.
+    void refreshTableBrowsers(bool all = false);
     bool fileClose();
     bool fileSaveAs();
     void createTable();
diff --git a/src/TableBrowser.cpp b/src/TableBrowser.cpp
@@ -536,6 +536,15 @@ void TableBrowser::refresh()
         });
     }
 
+    // Delete settings of no-longer existent tables
+    for (auto it = m_settings.cbegin(); it != m_settings.cend(); ) {
+        if (!db->getTableByName(it->first)) {
+            it = m_settings.erase(it);
+        } else {
+            ++it;
+        }
+    }
+
     // Retrieve the stored data for this table if there is any. If there are no settings for this table,
     // this will insert and return a settings object with default values.
     const sqlb::ObjectIdentifier tablename = currentlyBrowsedTableName();
@@ -551,9 +560,9 @@ void TableBrowser::refresh()
     emit currentTableChanged(tablename);
 
     // Build query and apply settings
-   applyModelSettings(storedData, buildQuery(storedData, tablename));
-   applyViewportSettings(storedData, tablename);
-   emit updatePlot(ui->dataTable, m_model, &m_settings[tablename], true);
+    applyModelSettings(storedData, buildQuery(storedData, tablename));
+    applyViewportSettings(storedData, tablename);
+    emit updatePlot(ui->dataTable, m_model, &m_settings[tablename], true);
 }
 
 void TableBrowser::clearFilters()

Original file line number	Diff line number	Diff line change
`@@ -671,14 +671,14 @@ void MainWindow::populateStructure(const std::vector<sqlb::ObjectIdentifier>& ol`
`671`	`671`	`ui->treeSchemaDock->resizeColumnToContents(DbStructureModel::ColumnName);`
`672`	`672`	`}`
`673`	`673`
`674`		`-void MainWindow::refreshTableBrowsers()`
	`674`	`+void MainWindow::refreshTableBrowsers(bool all)`
`675`	`675`	`{`
`676`	`676`	`QApplication::setOverrideCursor(Qt::WaitCursor);`
`677`	`677`	`for(const auto& d : allTableBrowserDocks())`
`678`	`678`	`{`
`679`	`679`	`// When in the Browse Data tab update all docks. Otherwise just update the floating ones because they might`
`680`	`680`	`// be visible even when another tab is active.`
`681`		`- if(ui->mainTab->currentWidget() == ui->browser \|\| d->isFloating())`
	`681`	`+ if(all \|\| ui->mainTab->currentWidget() == ui->browser \|\| d->isFloating())`
`682`	`682`	`{`
`683`	`683`	`TableBrowser* t = d->tableBrowser();`
`684`	`684`	`if(t)`
`@@ -3402,6 +3402,8 @@ void MainWindow::fileDetachTreeViewSelected(QTreeView* treeView)`
`3402`	`3402`	`std::string attached_as = treeView->model()->data(treeView->currentIndex().sibling(treeView->currentIndex().row(), DbStructureModel::ColumnSchema), Qt::EditRole).toString().toStdString();`
`3403`	`3403`	`if (db.detach(attached_as))`
`3404`	`3404`	`{`
	`3405`	`+ db.updateSchema();`
	`3406`	`+ refreshTableBrowsers(/* all */ true);`
`3405`	`3407`	`isProjectModified = true;`
`3406`	`3408`	`}`
`3407`	`3409`	`}`