Merge pull request #3703 from robertcv/fix/owsql_table_select

[FIX] SQL Table: Restore selected table from settings

Author: lanzagar

Orange/widgets/data/owsql.py

@@ -141,12 +141,6 @@ def __init__(self):
         self.tablecombo.setToolTip('table')
         tables.layout().addWidget(self.tablecombo)
 
-        index = self.tablecombo.findText(str(self.table))
-        if index != -1:
-            self.tablecombo.setCurrentIndex(index)
-        # set up the callback to select_table in case of selection change
-        self.tablecombo.activated[int].connect(self.select_table)
-
         self.connectbutton = gui.button(
             tables, self, '↻', callback=self.connect)
         self.connectbutton.setSizePolicy(
@@ -181,6 +175,11 @@ def __init__(self):
         gui.rubber(self.buttonsArea)
 
         self.connect()
+        index = self.tablecombo.findText(str(self.table))
+        if index != -1:
+            self.tablecombo.setCurrentIndex(index)
+        # set up the callback to select_table in case of selection change
+        self.tablecombo.activated[int].connect(self.select_table)
 
         QTimer.singleShot(0, self.select_table)
 

Orange/widgets/data/tests/test_owsql.py

@@ -92,6 +92,28 @@ def test_non_postgres(self, mock_backends):
         self.assertTrue(widget.download)
         self.assertFalse(widget.downloadcb.isEnabled())
 
+    @mock.patch('Orange.widgets.data.owsql.Table')
+    @mock.patch('Orange.widgets.data.owsql.SqlTable')
+    @mock.patch('Orange.widgets.data.owsql.Backend')
+    def test_restore_table(self, mock_backends, mock_sqltable, mock_table):
+        """Test if selected table is restored from settings"""
+        backend = mock.Mock()
+        backend().display_name = "database"
+        del backend().missing_extension
+        backend().list_tables.return_value = ["a", "b", "c"]
+        mock_backends.available_backends.return_value = [backend]
+        mock_sqltable().approx_len.return_value = 100
+
+        settings = {'__version__': 2,
+                    'host': '',
+                    'port': '',
+                    'guess_values': False,
+                    'download': False,
+                    'table': 'b'}
+
+        widget = self.create_widget(OWSql, stored_settings=settings)
+        self.assertEqual(widget.tablecombo.currentText(), "b")
+
 
 if __name__ == "__main__":
     unittest.main()