sqlbench 0.1.59__tar.gz → 0.1.61__tar.gz

{sqlbench-0.1.59 → sqlbench-0.1.61}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlbench
-Version: 0.1.59
+Version: 0.1.61
 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.59 → sqlbench-0.1.61}/sqlbench/qt/main_window.py

@@ -8,7 +8,7 @@ and tabbed query/spool interface.
 import subprocess
 import threading
 from typing import Optional, Dict, Any
-from PyQt6.QtCore import Qt, QSettings, QTimer, pyqtSignal
+from PyQt6.QtCore import Qt, QTimer, pyqtSignal
 from PyQt6.QtGui import QAction, QIcon, QKeySequence, QCloseEvent
 from PyQt6.QtWidgets import (
     QMainWindow,
@@ -141,25 +141,28 @@ class MainWindow(QMainWindow):
         self.status_bar.showMessage("Ready")
 
     def _restore_state(self) -> None:
-        """Restore window geometry and state."""
-        settings = QSettings("SQLBench", "SQLBench")
+        """Restore window size (position is compositor-controlled on Wayland)."""
+        w = get_setting("window_width")
+        h = get_setting("window_height")
 
-        # Restore geometry
-        geometry = settings.value("geometry")
-        if geometry:
-            self.restoreGeometry(geometry)
+        if w and h:
+            try:
+                w, h = int(w), int(h)
+                w = max(w, self.minimumWidth())
+                h = max(h, self.minimumHeight())
+                # Clamp to fit on screen
+                screen = QApplication.primaryScreen().availableGeometry()
+                w = min(w, screen.width())
+                h = min(h, screen.height())
+                self.resize(w, h)
+            except (ValueError, TypeError):
+                self.resize(1400, 900)
         else:
-            # Default size
             self.resize(1400, 900)
-            # Center on screen
-            screen = QApplication.primaryScreen().geometry()
-            self.move(
-                (screen.width() - self.width()) // 2,
-                (screen.height() - self.height()) // 2
-            )
 
         # Restore main splitter from ratio
         ratio_str = get_setting("layout_main_ratio")
+
         if ratio_str:
             try:
                 ratio = float(ratio_str)
@@ -209,9 +212,9 @@ class MainWindow(QMainWindow):
                 self._connect(last_conn)
 
     def _save_state(self) -> None:
-        """Save window geometry and state."""
-        settings = QSettings("SQLBench", "SQLBench")
-        settings.setValue("geometry", self.saveGeometry())
+        """Save window size and state."""
+        set_setting("window_width", str(self.width()))
+        set_setting("window_height", str(self.height()))
 
         # Save main splitter as ratio
         sizes = self.splitter.sizes()
@@ -332,13 +335,6 @@ class MainWindow(QMainWindow):
         self.splitter.setSizes([250, 1000])
         self.resize(1400, 900)
 
-        # Center on screen
-        screen = QApplication.primaryScreen().geometry()
-        self.move(
-            (screen.width() - self.width()) // 2,
-            (screen.height() - self.height()) // 2
-        )
-
         set_setting("font_size", "13")
         self._apply_font_size()
         self.status_bar.showMessage("Layout reset to defaults", 3000)
@@ -633,7 +629,12 @@ class MainWindow(QMainWindow):
             success, message = result
             self.status_bar.showMessage("Upgrade complete" if success else "Upgrade failed", 3000)
             if success:
-                QMessageBox.information(self, "Upgrade Complete", message)
+                result = QMessageBox.question(
+                    self, "Upgrade Complete",
+                    "SQLBench has been upgraded.\n\nWould you like to restart now?",
+                    QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No)
+                if result == QMessageBox.StandardButton.Yes:
+                    self._restart_app()
             else:
                 QMessageBox.warning(self, "Upgrade Failed", message)
 
@@ -642,6 +643,23 @@ class MainWindow(QMainWindow):
         thread.start()
         QTimer.singleShot(2000, poll_result)
 
+    def _restart_app(self) -> None:
+        """Restart the application."""
+        import sys
+        import os
+
+        # Save window state
+        self._save_state()
+
+        # Start new process before closing
+        if sys.argv[0].endswith('sqlbench') or 'sqlbench' in sys.argv[0]:
+            subprocess.Popen([sys.argv[0]])
+        else:
+            subprocess.Popen([sys.executable, '-m', 'sqlbench'])
+
+        self.close()
+        os._exit(0)
+
     def set_status(self, message: str, timeout: int = 0) -> None:
         """Set status bar message."""
         self.status_bar.showMessage(message, timeout)

{sqlbench-0.1.59 → sqlbench-0.1.61}/sqlbench/qt/tabs/sql_tab.py

@@ -281,6 +281,8 @@ class ScriptWorker(QThread):
                     "row_count": 0,
                     "success": True,
                     "error": None,
+                    "rows": None,
+                    "description": None,
                 }
 
                 try:
@@ -293,6 +295,8 @@ class ScriptWorker(QThread):
                         rows = cursor.fetchall()
                         result["row_count"] = len(rows)
                         result["status"] = f"{len(rows)} row(s) returned"
+                        result["description"] = cursor.description
+                        result["rows"] = rows[:10000]
                     else:
                         rc = cursor.rowcount if cursor.rowcount >= 0 else 0
                         result["row_count"] = rc
@@ -370,22 +374,31 @@ class SQLEditor(QPlainTextEdit):
         # Shortcuts
         self._setup_shortcuts()
 
+    def _add_menu_action(self, menu, text, slot, shortcut=None) -> QAction:
+        """Add action to menu with proper PyQt6 overload handling."""
+        action = QAction(text, menu)
+        if shortcut:
+            action.setShortcut(shortcut)
+        action.triggered.connect(slot)
+        menu.addAction(action)
+        return action
+
     def _show_context_menu(self, pos) -> None:
         """Show context menu."""
         menu = QMenu(self)
 
-        undo_action = menu.addAction("Undo", self.undo, QKeySequence("Ctrl+Z"))
-        undo_action.setEnabled(self.document().isUndoAvailable())
-        redo_action = menu.addAction("Redo", self.redo, QKeySequence("Ctrl+Y"))
-        redo_action.setEnabled(self.document().isRedoAvailable())
+        undo = self._add_menu_action(menu, "Undo", self.undo, QKeySequence("Ctrl+Z"))
+        undo.setEnabled(self.document().isUndoAvailable())
+        redo = self._add_menu_action(menu, "Redo", self.redo, QKeySequence("Ctrl+Y"))
+        redo.setEnabled(self.document().isRedoAvailable())
         menu.addSeparator()
-        menu.addAction("Cut", self.cut, QKeySequence("Ctrl+X"))
-        menu.addAction("Copy", self.copy, QKeySequence("Ctrl+C"))
-        menu.addAction("Paste", self.paste, QKeySequence("Ctrl+V"))
+        self._add_menu_action(menu, "Cut", self.cut, QKeySequence("Ctrl+X"))
+        self._add_menu_action(menu, "Copy", self.copy, QKeySequence("Ctrl+C"))
+        self._add_menu_action(menu, "Paste", self.paste, QKeySequence("Ctrl+V"))
         menu.addSeparator()
-        menu.addAction("Select All", self.selectAll, QKeySequence("Ctrl+A"))
+        self._add_menu_action(menu, "Select All", self.selectAll, QKeySequence("Ctrl+A"))
         menu.addSeparator()
-        menu.addAction("Find...", self.find_requested.emit, QKeySequence("Ctrl+F"))
+        self._add_menu_action(menu, "Find...", self.find_requested.emit, QKeySequence("Ctrl+F"))
 
         menu.exec(self.mapToGlobal(pos))
 
@@ -399,16 +412,6 @@ class SQLEditor(QPlainTextEdit):
         shortcut_exec_all = QShortcut(QKeySequence("Ctrl+F5"), self)
         shortcut_exec_all.activated.connect(self.execute_all_requested.emit)
 
-        # Ctrl+Z - Undo
-        shortcut_undo = QShortcut(QKeySequence("Ctrl+Z"), self)
-        shortcut_undo.activated.connect(self.undo)
-
-        # Ctrl+Y or Ctrl+Shift+Z - Redo
-        shortcut_redo = QShortcut(QKeySequence("Ctrl+Y"), self)
-        shortcut_redo.activated.connect(self.redo)
-        shortcut_redo2 = QShortcut(QKeySequence("Ctrl+Shift+Z"), self)
-        shortcut_redo2.activated.connect(self.redo)
-
     def update_theme(self) -> None:
         """Update colors when theme changes."""
         self.highlighter.update_theme()
@@ -532,10 +535,20 @@ class ResultsTable(QTableWidget):
     def _show_context_menu(self, pos) -> None:
         """Show context menu."""
         menu = QMenu(self)
-        menu.addAction("Copy", self._copy_selection, QKeySequence("Ctrl+C"))
+
+        copy_act = QAction("Copy", menu)
+        copy_act.setShortcut(QKeySequence("Ctrl+C"))
+        copy_act.triggered.connect(self._copy_selection)
+        menu.addAction(copy_act)
+
         menu.addAction("Copy with Headers", self._copy_with_headers)
         menu.addSeparator()
-        menu.addAction("Select All", self.selectAll, QKeySequence("Ctrl+A"))
+
+        sel_act = QAction("Select All", menu)
+        sel_act.setShortcut(QKeySequence("Ctrl+A"))
+        sel_act.triggered.connect(self.selectAll)
+        menu.addAction(sel_act)
+
         menu.exec(self.mapToGlobal(pos))
 
     def _copy_selection(self) -> None:
@@ -693,6 +706,8 @@ class SQLTab(QWidget):
         self._original_values: dict = {}  # row_index -> original row tuple
         self._modified_cells: dict = {}   # row_index -> {col_index: new_value}
         self._loading_results = False      # guard flag to ignore cellChanged during loads
+        self._in_script_mode = False
+        self._script_results = []          # result dicts for sub-tab field lookups
 
         self._setup_ui()
         self._connect_signals()
@@ -841,13 +856,19 @@ class SQLTab(QWidget):
         results_layout.setSpacing(0)
 
         # Results controls
-        controls = self._create_results_controls()
-        results_layout.addWidget(controls)
+        self._results_controls = self._create_results_controls()
+        results_layout.addWidget(self._results_controls)
 
         # Results table
         self.results_table = ResultsTable()
         results_layout.addWidget(self.results_table)
 
+        # Script sub-tabs (hidden by default, shown in script mode)
+        self._script_sub_tabs = QTabWidget()
+        self._script_sub_tabs.setDocumentMode(True)
+        self._script_sub_tabs.hide()
+        results_layout.addWidget(self._script_sub_tabs)
+
         # Status label
         self.results_status = QLabel("No results")
         self.results_status.setProperty("subheading", True)
@@ -1178,6 +1199,14 @@ class SQLTab(QWidget):
         self.results_table.verticalHeader().setDefaultSectionSize(row_height)
         self.fields_table.verticalHeader().setDefaultSectionSize(row_height)
 
+        # Scale any visible script sub-tab tables
+        if self._in_script_mode:
+            for i in range(self._script_sub_tabs.count()):
+                w = self._script_sub_tabs.widget(i)
+                if isinstance(w, ResultsTable):
+                    w.scale_columns(scale)
+                    w.verticalHeader().setDefaultSectionSize(row_height)
+
         # Update stats font
         font = self.stats_text.font()
         font.setPointSize(size)
@@ -1219,6 +1248,93 @@ class SQLTab(QWidget):
         self._script_worker.error.connect(self._on_query_error)
         self._script_worker.start()
 
+    def _enter_script_mode(self, results: List) -> None:
+        """Switch to script sub-tab layout."""
+        self._in_script_mode = True
+        self._script_results = results
+
+        # Hide single-query controls and table
+        self._results_controls.hide()
+        self.results_table.hide()
+
+        # Clear previous sub-tabs
+        try:
+            self._script_sub_tabs.currentChanged.disconnect(self._on_script_sub_tab_changed)
+        except TypeError:
+            pass
+        while self._script_sub_tabs.count():
+            w = self._script_sub_tabs.widget(0)
+            self._script_sub_tabs.removeTab(0)
+            w.deleteLater()
+
+        # Summary tab
+        summary_table = ResultsTable()
+        summary_table.setSortingEnabled(False)
+        summary_table.setColumnCount(4)
+        summary_table.setHorizontalHeaderLabels(["#", "SQL", "Result", "Time"])
+        summary_table.setRowCount(len(results))
+        for i, r in enumerate(results):
+            summary_table.setItem(i, 0, QTableWidgetItem(str(r["stmt"])))
+            summary_table.setItem(i, 1, QTableWidgetItem(r["sql"]))
+            status_item = QTableWidgetItem(r["status"])
+            if not r["success"]:
+                status_item.setForeground(QColor(255, 80, 80))
+            summary_table.setItem(i, 2, status_item)
+            summary_table.setItem(i, 3, QTableWidgetItem(f"{r['time']:.3f}s"))
+        summary_table.resizeColumnsToContents()
+        for col in range(summary_table.columnCount()):
+            if summary_table.columnWidth(col) > 400:
+                summary_table.setColumnWidth(col, 400)
+        summary_table.setSortingEnabled(True)
+        self._script_sub_tabs.addTab(summary_table, "Summary")
+
+        # Per-SELECT result tabs
+        for r in results:
+            if r["rows"] is not None and r["description"] is not None:
+                table = ResultsTable()
+                table.load_results(r["rows"], r["description"])
+                label = f"#{r['stmt']} {r['sql'][:40]}"
+                self._script_sub_tabs.addTab(table, label)
+
+        # Connect tab-changed signal for Fields updates
+        self._script_sub_tabs.currentChanged.connect(self._on_script_sub_tab_changed)
+
+        self._script_sub_tabs.show()
+
+    def _exit_script_mode(self) -> None:
+        """Restore single-query layout."""
+        if not self._in_script_mode:
+            return
+        self._in_script_mode = False
+        self._script_results = []
+
+        # Clear and hide sub-tabs
+        self._script_sub_tabs.hide()
+        while self._script_sub_tabs.count():
+            w = self._script_sub_tabs.widget(0)
+            self._script_sub_tabs.removeTab(0)
+            w.deleteLater()
+
+        # Restore single-query widgets
+        self._results_controls.show()
+        self.results_table.show()
+
+    def _on_script_sub_tab_changed(self, index: int) -> None:
+        """Update Fields tab when a script sub-tab is selected."""
+        if index == 0:
+            # Summary tab — clear fields
+            self._update_fields(None)
+            return
+        # Map sub-tab index to the result that has rows
+        select_idx = 0
+        for r in self._script_results:
+            if r["rows"] is not None and r["description"] is not None:
+                select_idx += 1
+                if select_idx == index:
+                    self._update_fields(r["description"])
+                    return
+        self._update_fields(None)
+
     def _on_script_finished(self, results: List, total_time: float) -> None:
         """Handle script execution completion."""
         self._reset_buttons()
@@ -1237,29 +1353,8 @@ class SQLTab(QWidget):
             except Exception:
                 pass
 
-        # Display results in table with script columns
-        self._loading_results = True
-        self.results_table.clear()
-        self.results_table.setSortingEnabled(False)
-        self.results_table.setColumnCount(4)
-        self.results_table.setHorizontalHeaderLabels(["#", "SQL", "Result", "Time"])
-        self.results_table.setRowCount(len(results))
-
-        for i, r in enumerate(results):
-            self.results_table.setItem(i, 0, QTableWidgetItem(str(r["stmt"])))
-            self.results_table.setItem(i, 1, QTableWidgetItem(r["sql"]))
-            status_item = QTableWidgetItem(r["status"])
-            if not r["success"]:
-                status_item.setForeground(QColor(255, 80, 80))
-            self.results_table.setItem(i, 2, status_item)
-            self.results_table.setItem(i, 3, QTableWidgetItem(f"{r['time']:.3f}s"))
-
-        self.results_table.resizeColumnsToContents()
-        for col in range(self.results_table.columnCount()):
-            if self.results_table.columnWidth(col) > 400:
-                self.results_table.setColumnWidth(col, 400)
-        self.results_table.setSortingEnabled(True)
-        self._loading_results = False
+        # Build script sub-tabs (summary + per-SELECT result tabs)
+        self._enter_script_mode(results)
 
         # Update statistics
         success = sum(1 for r in results if r["success"])
@@ -1370,6 +1465,7 @@ class SQLTab(QWidget):
                           exec_time: float, fetch_time: float,
                           total_rows: int = 0) -> None:
         """Handle query completion."""
+        self._exit_script_mode()
         self._reset_buttons()
 
         # Log to database
@@ -1561,6 +1657,7 @@ class SQLTab(QWidget):
                         exec_time: float, fetch_time: float,
                         total_rows: int = 0) -> None:
         """Handle page load completion."""
+        self._exit_script_mode()
         self._reset_buttons()
 
         self._loading_results = True

{sqlbench-0.1.59 → sqlbench-0.1.61}/sqlbench/version.py

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