dbqm 2.3.1__tar.gz → 2.3.2__tar.gz

{dbqm-2.3.1 → dbqm-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbqm
-Version: 2.3.1
+Version: 2.3.2
 Summary: Multi-database interactive query tool with fullscreen TUI
 Author: Silvio Chagas
 License-Expression: MIT
@@ -23,6 +23,7 @@ Requires-Dist: pymssql>=2.2; sys_platform != "win32" or platform_machine != "ARM
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: pytest-asyncio>=0.23; extra == "dev"
+Requires-Dist: mypy>=1.11; extra == "dev"
 Provides-Extra: oracle
 Requires-Dist: oracledb>=2.0; extra == "oracle"
 Provides-Extra: postgres

dbqm-2.3.2/dbqm/_version.py

@@ -0,0 +1 @@
+__version__ = "2.3.2"

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/cli/commands/query.py

@@ -321,12 +321,23 @@ def cmd_sql(args: argparse.Namespace) -> None:
         _fail_or_print(args, "sql", "usage", "DML requer --commit para confirmar a operacao.")
 
     try:
-        result = deps.execute_adhoc(sql, conn, param_values, auto_commit=args.commit)
+        outcome = deps.execute_adhoc(sql, conn, param_values, auto_commit=args.commit)
     except deps.ReadOnlyViolation as e:
         _fail_or_print(args, "sql", "read_only", str(e))
 
+    # `execute_adhoc` only returns the `(result, connection)` tuple for a DML
+    # statement left uncommitted (`auto_commit=False`); the --commit guard
+    # above already exits before this call whenever `sql_type` is DML and
+    # `--commit` was not given, and no other `sql_type` ever produces that
+    # tuple. So this call always yields a plain `AdhocResult`.
+    if isinstance(outcome, tuple):  # pragma: no cover - unreachable, see above
+        raise RuntimeError(
+            "execute_adhoc returned a manual-commit tuple despite auto_commit=True"
+        )
+    result = outcome
+
     # For non-SELECT results (always AdhocResult with auto_commit=True at this point)
-    if not isinstance(result, tuple) and result.sql_type in ("INSERT", "UPDATE", "DELETE"):
+    if result.sql_type in ("INSERT", "UPDATE", "DELETE"):
         if not result.success:
             _fail_or_print(args, "sql", _sql_error_code(result.error, result.error_kind),
                             result.error or "Erro ao executar SQL.")
@@ -337,7 +348,7 @@ def cmd_sql(args: argparse.Namespace) -> None:
         return
 
     # DDL results
-    if not isinstance(result, tuple) and result.sql_type == "DDL":
+    if result.sql_type == "DDL":
         if not result.success:
             code = _sql_error_code(result.error, result.error_kind)
             if args.format == "json":
@@ -352,7 +363,7 @@ def cmd_sql(args: argparse.Namespace) -> None:
         return
 
     # PL/SQL anonymous block results
-    if not isinstance(result, tuple) and result.sql_type == "PLSQL":
+    if result.sql_type == "PLSQL":
         if not result.success:
             _fail_or_print(args, "sql", _sql_error_code(result.error, result.error_kind),
                             result.error or "Erro ao executar bloco.")

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/cli/envelope.py

@@ -17,12 +17,12 @@ from __future__ import annotations
 
 import json
 import sys
-from typing import Any, NoReturn
+from typing import Any, NoReturn, TextIO
 
 from dbqm.cli.errors import exit_for
 
 
-def _write(stream, payload: dict) -> None:
+def _write(stream: TextIO, payload: dict[str, Any]) -> None:
     json.dump(payload, stream, indent=2, ensure_ascii=False, default=str)
     stream.write("\n")
 

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/cli/params.py

@@ -5,6 +5,7 @@ import argparse
 import getpass
 import os
 import sys
+from typing import Literal, overload
 
 from rich.markup import escape
 
@@ -14,7 +15,7 @@ from dbqm.cli.render import console
 
 
 def _parse_params(param_list: list[str] | None, args: argparse.Namespace | None = None,
-                   command: str = "params") -> dict:
+                   command: str = "params") -> dict[str, str]:
     """Parse key=value parameter pairs from CLI arguments.
 
     `args`/`command` let a malformed `-p` speak the envelope under `-f json`
@@ -77,6 +78,16 @@ def _add_connection_fields(parser: argparse.ArgumentParser) -> None:
                         help="Formato de saida")
 
 
+@overload
+def resolve_password(
+    args: argparse.Namespace, env_var: str, prompt: str, *, required: Literal[True],
+    use_env: bool = True, command: str = "password",
+) -> str: ...
+@overload
+def resolve_password(
+    args: argparse.Namespace, env_var: str, prompt: str, *, required: bool,
+    use_env: bool = True, command: str = "password",
+) -> str | None: ...
 def resolve_password(
     args: argparse.Namespace, env_var: str, prompt: str, *, required: bool,
     use_env: bool = True, command: str = "password",
@@ -110,7 +121,11 @@ def resolve_password(
     `table`'s unchanged prose-and-`sys.exit` branch.
     """
     from_stdin = getattr(args, "password_stdin", False)
-    direct = getattr(args, "password", None)
+    # `args.password`, where the parser defines it, is a plain string
+    # argument (argparse's `--password`). `argparse.Namespace` is untyped
+    # so `getattr` returns `Any`; the annotation states what the value
+    # actually is instead of letting that `Any` leak into the return type.
+    direct: str | None = getattr(args, "password", None)
     fmt = getattr(args, "format", "table")
 
     if from_stdin and direct:

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/cli/render.py

@@ -7,6 +7,7 @@ from rich.console import Console
 from rich.table import Table
 from rich.theme import Theme as _RichTheme
 
+from dbqm.core.group_engine import ComparisonResult
 from dbqm.design.tokens import DARK_TOKENS
 
 
@@ -68,7 +69,7 @@ def _print_query_result(result: Any, output_format: str = "table") -> None:
         console.print(f"[dim]{result.row_count} registros em {result.elapsed:.2f}s[/dim]")
 
 
-def _colored_comparison_lines(comparisons: list) -> list[str]:
+def _colored_comparison_lines(comparisons: list[ComparisonResult]) -> list[str]:
     """Linhas de resumo do grupo, coloridas pelo eixo de veredito.
 
     Reconstroi o texto a partir de `ComparisonResult` (contagens), em vez de

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/core/audit.py

@@ -16,7 +16,7 @@ def log_execution(
     action: str,
     name: str,
     connection: str = "",
-    params: dict | None = None,
+    params: dict[str, str] | None = None,
     row_count: int = 0,
     success: bool = True,
     error: str = "",

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/core/ddl_mysql.py

@@ -1,10 +1,12 @@
 """MySQL DDL extraction via SHOW CREATE statements."""
 from __future__ import annotations
 
+from typing import Any
+
 from dbqm.core.ddl_extractor import ExtractionResult, ExtractedObject
 
 
-def extract_mysql_ddl(db, object_name: str, result: ExtractionResult, on_progress=None):
+def extract_mysql_ddl(db: Any, object_name: str, result: ExtractionResult, on_progress: Any = None) -> None:
     """Extract DDL for a MySQL object (table, view, procedure, function)."""
     cursor = db.cursor()
     name = object_name.strip()

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/core/html_report.py

@@ -29,7 +29,7 @@ def _light_theme_block(tokens: dict[str, str]) -> str:
     return f"@media (prefers-color-scheme: light) {{\n  :root {{\n{linhas}\n  }}\n}}"
 
 
-def export_group_html(group_result: GroupResult, params: dict | None = None) -> str:
+def export_group_html(group_result: GroupResult, params: dict[str, str] | None = None) -> str:
     """Export group comparison as a standalone HTML file. Returns file path."""
     query_names = list(group_result.query_results.keys())
     filepath = _build_filepath("grupos", group_result.group_name, params=params, ext="html")
@@ -47,7 +47,7 @@ def _status_label(status: str) -> str:
     return {"OK": "OK", "OK*": "OK*", "DIFF": "DIFERE", "ABSENT": "AUSENTE"}.get(status, status)
 
 
-def _build_html(group_result: GroupResult, query_names: list[str], params: dict | None) -> str:
+def _build_html(group_result: GroupResult, query_names: list[str], params: dict[str, str] | None) -> str:
     now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
     overall = "CONSISTENTE" if group_result.all_match else "DIVERGENTE"
     overall_class = "ok" if group_result.all_match else "diff"

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/core/paths.py

@@ -24,7 +24,7 @@ SETTINGS_FILE = CONFIG_DIR / "settings.json"
 TEMPLATES_DIR = DBQM_HOME / "templates"
 TEMPLATES_FILE = TEMPLATES_DIR / "templates.json"
 
-def ensure_dirs():
+def ensure_dirs() -> None:
     """Create data directories if they don't exist."""
     for d in [CONFIG_DIR, EXPORTS_DIR, HISTORY_DIR, TEMPLATES_DIR]:
         d.mkdir(parents=True, exist_ok=True)

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/core/read_only.py

@@ -13,9 +13,13 @@ the generated statement, the careless paste.
 from __future__ import annotations
 
 import re
+from typing import TYPE_CHECKING
 
 import sqlparse
 
+if TYPE_CHECKING:
+    from dbqm.models.connection import Connection
+
 #: What a query-only connection may carry. `EXPLAIN` is here only as a
 #: prefix — see `_explains_a_query`, which is what decides whether a given
 #: EXPLAIN is actually read-only.
@@ -52,7 +56,10 @@ def statement_count(sql: str) -> int:
     and neither is one inside a string literal -- `sqlparse` handles both,
     which is why the count is not a `str.count(";")`.
     """
-    return len([s for s in sqlparse.parse(sql) if s.token_first() is not None])
+    return len([
+        s for s in sqlparse.parse(sql)
+        if s.token_first() is not None  # type: ignore[no-untyped-call]  # sqlparse ships py.typed, but Statement.token_first() itself is unannotated upstream
+    ])
 
 
 def _explains_a_query(sql: str) -> bool:
@@ -76,7 +83,7 @@ def _explains_a_query(sql: str) -> bool:
     return classify_sql(restante) == "SELECT"
 
 
-def check_read_only(sql: str, conn) -> None:
+def check_read_only(sql: str, conn: "Connection") -> None:
     """Raise `ReadOnlyViolation` if `conn` is read-only and `sql` could write.
 
     Does nothing when the connection is writable, so callers can invoke it

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/core/template_engine.py

@@ -127,7 +127,7 @@ def render_template(
     values: dict[str, str],
 ) -> str:
     """Render template content by replacing {{field}} placeholders with values."""
-    def _replace(match: re.Match) -> str:
+    def _replace(match: re.Match[str]) -> str:
         field_name = match.group(1)
         return values.get(field_name, match.group(0))
 

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/main.py

@@ -2,7 +2,7 @@
 import sys
 
 
-def main():
+def main() -> None:
     # Version flag
     if len(sys.argv) == 2 and sys.argv[1] in ("--version", "-V"):
         from dbqm._version import __version__

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/models/connection.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import json
 from dataclasses import dataclass, field, asdict
 from datetime import datetime
-from typing import Optional
+from typing import Any, Optional
 
 from dbqm.core.paths import CONFIG_DIR, CONNECTIONS_FILE
 
@@ -31,12 +31,12 @@ class Connection:
     read_only: bool = False
     created_at: str = field(default_factory=lambda: datetime.now().isoformat(timespec="seconds"))
 
-    def to_dict(self) -> dict:
+    def to_dict(self) -> dict[str, Any]:
         d = asdict(self)
         return {k: v for k, v in d.items() if v is not None}
 
     @classmethod
-    def from_dict(cls, data: dict) -> Connection:
+    def from_dict(cls, data: dict[str, Any]) -> Connection:
         valid_fields = {f.name for f in cls.__dataclass_fields__.values()}
         filtered = {k: v for k, v in data.items() if k in valid_fields}
         return cls(**filtered)

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/models/settings.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 
 import json
 from dataclasses import dataclass, asdict
+from typing import Any
 
 from dbqm.core.paths import CONFIG_DIR, SETTINGS_FILE
 
@@ -20,11 +21,11 @@ class Settings:
     # tool (e.g. PL/SQL Developer) cannot hijack the 64-bit client dbqm needs.
     oracle_client_dir: str = ""
 
-    def to_dict(self) -> dict:
+    def to_dict(self) -> dict[str, Any]:
         return asdict(self)
 
     @classmethod
-    def from_dict(cls, data: dict) -> Settings:
+    def from_dict(cls, data: dict[str, Any]) -> Settings:
         return cls(
             audit_log_enabled=data.get("audit_log_enabled", False),
             theme=data.get("theme", "plano-escuro"),

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/models/template.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 import json
 from dataclasses import dataclass, field, asdict
 from datetime import datetime
-from typing import Optional
+from typing import Any, Optional
 
 from dbqm.core.paths import TEMPLATES_DIR, TEMPLATES_FILE
 
@@ -16,11 +16,11 @@ class Template:
     content: str  # Template text with {{field}} placeholders
     created_at: str = field(default_factory=lambda: datetime.now().isoformat(timespec="seconds"))
 
-    def to_dict(self) -> dict:
+    def to_dict(self) -> dict[str, str]:
         return asdict(self)
 
     @classmethod
-    def from_dict(cls, data: dict) -> Template:
+    def from_dict(cls, data: dict[str, Any]) -> Template:
         return cls(
             name=data["name"],
             description=data.get("description", ""),

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/ui/modals/column_maps.py

@@ -10,7 +10,7 @@ from textual.widgets import Button, DataTable, Input, Select
 from dbqm.ui.widgets.dialog import Dialog
 
 
-class ColumnMapsModal(ModalScreen[dict | None]):
+class ColumnMapsModal(ModalScreen[dict[str, dict[str, str]] | None]):
     """Configure column value mappings (DE-PARA).
 
     Dismisses with updated maps dict on save, or None on cancel/ESC.

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/ui/modals/export_picker.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 from typing import Callable
 
-from textual.app import ComposeResult
+from textual.app import App, ComposeResult
 from textual.binding import Binding
 from textual.screen import ModalScreen
 from textual.widgets import Button
@@ -61,7 +61,7 @@ class ExportPickerModal(ModalScreen[str | None]):
 
 
 def request_export(
-    app,
+    app: App[object],
     callback: Callable[[str | None], None] | None = None,
 ) -> None:
     """Public entry point for the export flow.

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/ui/modals/param_input.py

@@ -60,7 +60,7 @@ class ParamModal(ModalScreen[dict[str, str] | None]):
     def __init__(
         self,
         query_name: str,
-        params: list[dict],
+        params: list[dict[str, str]],
         last_values: dict[str, str] | None = None,
         description: str = "",
     ) -> None:

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/ui/screens/config_port.py

@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 from pathlib import Path
+from typing import Any
 
 from textual import work
 from textual.app import ComposeResult
@@ -110,7 +111,7 @@ class ConfigPortScreen(Vertical):
     }
     """
 
-    def __init__(self, initial_mode: str | None = None, **kwargs) -> None:
+    def __init__(self, initial_mode: str | None = None, **kwargs: Any) -> None:
         super().__init__(**kwargs)
         self._initial_mode = initial_mode
 

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/ui/utils.py

@@ -7,7 +7,7 @@ from textual.containers import VerticalScroll
 from textual.widgets import Select
 
 
-class NavSelect(Select):
+class NavSelect(Select[str | None]):
     """Select widget that opens only with Enter/Space, not arrows.
 
     This allows arrow keys to navigate between widgets in form screens

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm/ui/widgets/sql_viewer.py

@@ -1,6 +1,8 @@
 """Read-only SQL display widget with syntax highlighting."""
 from __future__ import annotations
 
+from typing import Any
+
 from rich.syntax import Syntax
 from textual.widgets import Static
 
@@ -27,7 +29,7 @@ class SqlViewer(Static):
     }
     """
 
-    def __init__(self, sql: str = "", **kwargs) -> None:
+    def __init__(self, sql: str = "", **kwargs: Any) -> None:
         super().__init__(**kwargs)
         self._sql = sql
 

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbqm
-Version: 2.3.1
+Version: 2.3.2
 Summary: Multi-database interactive query tool with fullscreen TUI
 Author: Silvio Chagas
 License-Expression: MIT
@@ -23,6 +23,7 @@ Requires-Dist: pymssql>=2.2; sys_platform != "win32" or platform_machine != "ARM
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: pytest-asyncio>=0.23; extra == "dev"
+Requires-Dist: mypy>=1.11; extra == "dev"
 Provides-Extra: oracle
 Requires-Dist: oracledb>=2.0; extra == "oracle"
 Provides-Extra: postgres

{dbqm-2.3.1 → dbqm-2.3.2}/dbqm.egg-info/requires.txt

@@ -12,6 +12,7 @@ pymssql>=2.2
 [dev]
 pytest>=7.0
 pytest-asyncio>=0.23
+mypy>=1.11
 
 [oracle]
 oracledb>=2.0

{dbqm-2.3.1 → dbqm-2.3.2}/pyproject.toml

@@ -36,7 +36,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-dev = ["pytest>=7.0", "pytest-asyncio>=0.23"]
+dev = ["pytest>=7.0", "pytest-asyncio>=0.23", "mypy>=1.11"]
 oracle = ["oracledb>=2.0"]
 postgres = ["psycopg[binary]>=3.1"]
 sqlserver = ["pymssql>=2.2"]
@@ -87,3 +87,64 @@ select = [
 #                code to satisfy a number nobody chose.
 #   I     197 -- import order. First family to widen into; mostly automatic.
 #   F     180 -- 129 unused variables, 45 unused imports. Second to widen.
+
+[tool.mypy]
+python_version = "3.10"          # `requires-python = ">=3.10"`
+files = ["dbqm"]                 # so plain `uv run mypy` checks the package
+strict = true
+# A module NOT listed below is strict. That is the ratchet: every new module
+# is strict from its first line, and the list only ever shrinks.
+
+[[tool.mypy.overrides]]
+# `pymysql` is the one dependency without `py.typed`. Named alone rather than
+# globally: a blanket `ignore_missing_imports` would silently downgrade a
+# future dependency to `Any`, which is exactly the mistake that made the first
+# measurement of this work report 464 findings instead of 396.
+module = ["pymysql.*"]
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+# 36 modules not yet clean under `--strict`, measured 2026-09-13 (361 findings
+# total). Generated from a real run, not transcribed:
+#   uv run mypy --strict dbqm/ 2>&1 | sed 's/:.*//' | sort -u
+# Each entry carries its finding count as a debt register, not just a list of
+# names. This list only shrinks -- see tests/design/test_typing_policy.py.
+module = [
+    "dbqm.cli.commands.connection",    # 3
+    "dbqm.cli.commands.inspect",       # 17
+    "dbqm.cli.commands.schema",        # 4
+    "dbqm.core.config_portability",    # 11
+    "dbqm.core.connection_builder",    # 5
+    "dbqm.core.db_manager",            # 2
+    "dbqm.core.ddl_extractor",         # 42
+    "dbqm.core.ddl_pg",                # 9
+    "dbqm.core.exporter",              # 17
+    "dbqm.core.group_engine",          # 11
+    "dbqm.core.history",               # 5
+    "dbqm.core.object_browser",        # 22
+    "dbqm.core.package_editor",        # 7
+    "dbqm.core.query_engine",          # 18
+    "dbqm.core.table_browser",         # 9
+    "dbqm.main",                       # 1
+    "dbqm.models.group",               # 6
+    "dbqm.models.query",               # 6
+    "dbqm.ui.app",                     # 20
+    "dbqm.ui.screens.adhoc",           # 12
+    "dbqm.ui.screens.browser",         # 20
+    "dbqm.ui.screens.connections",     # 5
+    "dbqm.ui.screens.exec_routine",    # 10
+    "dbqm.ui.screens.group_exec",      # 4
+    "dbqm.ui.screens.group_manage",    # 11
+    "dbqm.ui.screens.group_run",       # 18
+    "dbqm.ui.screens.history",         # 3
+    "dbqm.ui.screens.package_editor",  # 10
+    "dbqm.ui.screens.query_exec",      # 14
+    "dbqm.ui.screens.query_manage",    # 6
+    "dbqm.ui.screens.settings",        # 5
+    "dbqm.ui.screens.template_manage", # 4
+    "dbqm.ui.screens.tools",           # 3
+    "dbqm.ui.widgets.group_result",    # 14
+    "dbqm.ui.widgets.query_list",      # 4
+    "dbqm.ui.widgets.result_table",    # 3
+]
+ignore_errors = true

dbqm-2.3.1/dbqm/_version.py

@@ -1 +0,0 @@
-__version__ = "2.3.1"