sqlbench 0.1.55__tar.gz → 0.1.57__tar.gz

{sqlbench-0.1.55 → sqlbench-0.1.57}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlbench
-Version: 0.1.55
+Version: 0.1.57
 Summary: A multi-database SQL workbench with support for IBM i, MySQL, and PostgreSQL
 Project-URL: Homepage, https://github.com/jpsteil/sqlbench
 Project-URL: Repository, https://github.com/jpsteil/sqlbench

{sqlbench-0.1.55 → sqlbench-0.1.57}/sqlbench/qt/dialogs/connection_dialog.py

@@ -303,6 +303,7 @@ class ConnectionDialog(QDialog):
         import subprocess
         import sys
         import threading
+        from PyQt6.QtCore import QTimer
 
         db_type = self.cmb_type.currentData()
         adapter_cls = ADAPTERS.get(db_type)
@@ -317,23 +318,34 @@ class ConnectionDialog(QDialog):
 
         self.btn_install_driver.setEnabled(False)
         self.btn_install_driver.setText("Installing...")
+        self._install_result = None  # (success: bool, error: str or None)
 
         def do_install():
             try:
                 result = subprocess.run(
                     [sys.executable, "-m", "pip", "install", pkg],
-                    capture_output=True, text=True)
-                from PyQt6.QtCore import QTimer
+                    capture_output=True, text=True,
+                    stdin=subprocess.DEVNULL, timeout=120)
                 if result.returncode == 0:
-                    QTimer.singleShot(0, self._on_driver_installed)
+                    self._install_result = (True, None)
                 else:
                     error = result.stderr or result.stdout or "Unknown error"
-                    QTimer.singleShot(0, lambda: self._on_driver_install_failed(error))
+                    self._install_result = (False, error)
             except Exception as e:
-                from PyQt6.QtCore import QTimer
-                QTimer.singleShot(0, lambda: self._on_driver_install_failed(str(e)))
+                self._install_result = (False, str(e))
+
+        def poll_result():
+            if self._install_result is None:
+                QTimer.singleShot(500, poll_result)
+                return
+            success, error = self._install_result
+            if success:
+                self._on_driver_installed()
+            else:
+                self._on_driver_install_failed(error)
 
         threading.Thread(target=do_install, daemon=True).start()
+        QTimer.singleShot(2000, poll_result)
 
     def _on_driver_installed(self) -> None:
         """Handle successful driver installation."""

{sqlbench-0.1.55 → sqlbench-0.1.57}/sqlbench/qt/main_window.py

@@ -599,30 +599,42 @@ class MainWindow(QMainWindow):
 
     def _run_upgrade(self) -> None:
         """Run pipx upgrade in background."""
+        self._upgrade_result = None  # (success: bool, message: str)
+
         def do_upgrade():
             try:
                 result = subprocess.run(
                     ["pipx", "upgrade", "sqlbench"],
-                    capture_output=True, text=True)
+                    capture_output=True, text=True,
+                    stdin=subprocess.DEVNULL, timeout=120)
                 if result.returncode == 0:
-                    QTimer.singleShot(0, lambda: QMessageBox.information(
-                        self, "Upgrade Complete",
-                        "SQLBench has been upgraded.\nPlease restart to use the new version."))
+                    self._upgrade_result = (True, "SQLBench has been upgraded.\nPlease restart to use the new version.")
                 else:
                     error = result.stderr or result.stdout or "Unknown error"
-                    QTimer.singleShot(0, lambda: QMessageBox.warning(
-                        self, "Upgrade Failed", f"Failed to upgrade:\n{error}"))
+                    self._upgrade_result = (False, f"Failed to upgrade:\n{error}")
+            except subprocess.TimeoutExpired:
+                self._upgrade_result = (False, "Upgrade timed out. Please upgrade manually:\n\npipx upgrade sqlbench")
             except FileNotFoundError:
-                QTimer.singleShot(0, lambda: QMessageBox.warning(
-                    self, "Upgrade Failed",
-                    "pipx not found. Please upgrade manually:\n\npipx upgrade sqlbench"))
+                self._upgrade_result = (False, "pipx not found. Please upgrade manually:\n\npipx upgrade sqlbench")
             except Exception as e:
-                QTimer.singleShot(0, lambda: QMessageBox.warning(
-                    self, "Upgrade Failed", f"Failed to upgrade:\n{e}"))
+                self._upgrade_result = (False, f"Failed to upgrade:\n{e}")
+
+        def poll_result():
+            result = self._upgrade_result
+            if result is None:
+                QTimer.singleShot(500, poll_result)
+                return
+            success, message = result
+            self.status_bar.showMessage("Upgrade complete" if success else "Upgrade failed", 3000)
+            if success:
+                QMessageBox.information(self, "Upgrade Complete", message)
+            else:
+                QMessageBox.warning(self, "Upgrade Failed", message)
 
         self.status_bar.showMessage("Upgrading SQLBench...")
         thread = threading.Thread(target=do_upgrade, daemon=True)
         thread.start()
+        QTimer.singleShot(2000, poll_result)
 
     def set_status(self, message: str, timeout: int = 0) -> None:
         """Set status bar message."""

{sqlbench-0.1.55 → sqlbench-0.1.57}/sqlbench/version.py

@@ -4,7 +4,7 @@ import threading
 import urllib.request
 import json
 
-__version__ = "0.1.55"
+__version__ = "0.1.57"
 
 
 def get_installed_version():