Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] SQL: Save selected backend to settings #4270

Merged
merged 1 commit into from
Dec 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Orange/widgets/data/owsql.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class Outputs:

settings_version = 2

selected_backend = Setting(None)
table = Setting(None)
sql = Setting("")
guess_values = Setting(True)
Expand Down Expand Up @@ -89,11 +90,19 @@ def _add_backend_controls(self):
self.backendcombo = QComboBox(box)
if self.backends:
self.backendcombo.setModel(self.backends)
names = [backend.display_name for backend in self.backends]
if self.selected_backend and self.selected_backend in names:
self.backendcombo.setCurrentText(self.selected_backend)
else:
self.Error.no_backends()
box.setEnabled(False)
self.backendcombo.currentTextChanged.connect(self.__backend_changed)
box.layout().insertWidget(0, self.backendcombo)

def __backend_changed(self):
backend = self.get_backend()
self.selected_backend = backend.display_name if backend else None

def _add_tables_controls(self):
vbox = gui.vBox(self.controlArea, "Tables", addSpace=True)
box = gui.vBox(vbox)
Expand Down
29 changes: 28 additions & 1 deletion Orange/widgets/data/tests/test_owsql.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from Orange.data import Table
from Orange.widgets.data.owsql import OWSql
from Orange.widgets.tests.base import WidgetTest
from Orange.widgets.tests.base import WidgetTest, simulate
from Orange.tests.sql.base import DataBaseTest as dbt


Expand Down Expand Up @@ -116,6 +116,33 @@ def test_restore_table(self, mock_backends, mock_sqltable, mock_table):
widget = self.create_widget(OWSql, stored_settings=settings)
self.assertEqual(widget.tablecombo.currentText(), "b")

@mock.patch("Orange.data.sql.backend.base.Backend.available_backends")
def test_selected_backend(self, mocked_backends: mock.Mock):
b1, b2 = mock.Mock(), mock.Mock()
b1.display_name = "B1"
b2.display_name = "B2"
mocked_backends.return_value = [b1, b2]

widget = self.create_widget(OWSql)
self.assertEqual(widget.backendcombo.currentText(), "B1")

simulate.combobox_activate_index(widget.backendcombo, 1)
self.assertEqual(widget.backendcombo.currentText(), "B2")

settings = widget.settingsHandler.pack_data(widget)
widget = self.create_widget(OWSql, stored_settings=settings)
self.assertEqual(widget.backendcombo.currentText(), "B2")

settings = widget.settingsHandler.pack_data(widget)
settings["selected_backend"] = "B3"
widget = self.create_widget(OWSql, stored_settings=settings)
self.assertEqual(widget.backendcombo.currentText(), "B1")

mocked_backends.return_value = []
settings = widget.settingsHandler.pack_data(widget)
widget = self.create_widget(OWSql, stored_settings=settings)
self.assertEqual(widget.backendcombo.currentText(), "")


if __name__ == "__main__":
unittest.main()