jusi-postgres 0.2.0__tar.gz → 0.2.1__tar.gz

{jusi_postgres-0.2.0 → jusi_postgres-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jusi-postgres
-Version: 0.2.0
+Version: 0.2.1
 Summary: PostgreSQL provider plugin for Jusi SQL
 Author: Jusi contributors
 License: MIT License
@@ -27,7 +27,7 @@ License: MIT License
 License-File: LICENSE
 Requires-Python: >=3.9
 Requires-Dist: jusi-sql<0.3,>=0.2
-Requires-Dist: jusi<2,>=1.0
+Requires-Dist: jusi<2,>=1.0.2
 Requires-Dist: psycopg[binary]>=3.1
 Requires-Dist: visidata<4,>=3
 Provides-Extra: test
@@ -91,6 +91,10 @@ transaction, and server-side cursors. `JusiInterrupt` requests cancellation on
 that connection. Closing the client closes its cursors, metadata connection,
 main connection, private control socket, and staged launch data.
 
+The terminal application loads normal VisiData user configuration and plugins
+before installing Jusi and PostgreSQL commands. This includes `~/.visidatarc`
+and paths selected through `VD_CONFIG` and `VD_DIR`.
+
 ## Local development database
 
 Start a disposable PostgreSQL fixture:

{jusi_postgres-0.2.0 → jusi_postgres-0.2.1}/README.md

@@ -55,6 +55,10 @@ transaction, and server-side cursors. `JusiInterrupt` requests cancellation on
 that connection. Closing the client closes its cursors, metadata connection,
 main connection, private control socket, and staged launch data.
 
+The terminal application loads normal VisiData user configuration and plugins
+before installing Jusi and PostgreSQL commands. This includes `~/.visidatarc`
+and paths selected through `VD_CONFIG` and `VD_DIR`.
+
 ## Local development database
 
 Start a disposable PostgreSQL fixture:

{jusi_postgres-0.2.0 → jusi_postgres-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "jusi-postgres"
-version = "0.2.0"
+version = "0.2.1"
 description = "PostgreSQL provider plugin for Jusi SQL"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -13,7 +13,7 @@ authors = [
   { name = "Jusi contributors" }
 ]
 dependencies = [
-  "jusi>=1.0,<2",
+  "jusi>=1.0.2,<2",
   "jusi-sql>=0.2,<0.3",
   "psycopg[binary]>=3.1",
   "visidata>=3,<4",

{jusi_postgres-0.2.0 → jusi_postgres-0.2.1}/src/jusi_postgres/__init__.py

@@ -2,4 +2,4 @@ from __future__ import annotations
 
 __all__ = ["__version__"]
 
-__version__ = "0.2.0"
+__version__ = "0.2.1"

{jusi_postgres-0.2.0 → jusi_postgres-0.2.1}/src/jusi_postgres/runner.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import json
 import curses
 from pathlib import Path
+import re
 import sys
 import tempfile
 import threading
@@ -37,6 +38,9 @@ POSTGRES_KEYWORDS = (
     "VALUES", "UPDATE", "SET", "DELETE", "RETURNING", "WITH", "AS", "DISTINCT",
     "CREATE", "ALTER", "DROP", "TABLE", "VIEW", "INDEX", "BEGIN", "COMMIT", "ROLLBACK",
 )
+POSTGRES_RELATION_KEYWORDS = frozenset({
+    "FROM", "JOIN", "INTO", "UPDATE", "TABLE", "VIEW", "DESCRIBE", "DESC",
+})
 _PENDING_SHEETS: deque[Any] = deque()
 
 
@@ -129,7 +133,7 @@ class PostgresSession:
     def complete(self, request: SqlCompletionRequest) -> dict[str, Any]:
         self.show_metadata_warnings()
         snapshot = MetadataSnapshot() if not self.collect_metadata else self.metadata.snapshot()
-        return complete_sql(snapshot, request, keywords=POSTGRES_KEYWORDS)
+        return _complete_postgres_sql(snapshot, request)
 
     def enter_cell(self) -> None:
         if not self.collect_metadata:
@@ -240,6 +244,30 @@ class PostgresSession:
             sheet.cursor_closed_reason = reason
 
 
+def _complete_postgres_sql(
+    snapshot: MetadataSnapshot,
+    request: SqlCompletionRequest,
+) -> dict[str, list[dict[str, Any]]]:
+    if _is_blank_relation_context(request.prefix):
+        snapshot = MetadataSnapshot(
+            schemas=list(snapshot.schemas),
+            refreshed_at=snapshot.refreshed_at,
+        )
+    return complete_sql(
+        snapshot,
+        request,
+        keywords=POSTGRES_KEYWORDS,
+        relation_keywords=POSTGRES_RELATION_KEYWORDS,
+    )
+
+
+def _is_blank_relation_context(prefix: str) -> bool:
+    if not prefix or not prefix[-1].isspace():
+        return False
+    words = re.findall(r"[A-Za-z_][A-Za-z0-9_]*", prefix)
+    return bool(words and words[-1].upper() in POSTGRES_RELATION_KEYWORDS)
+
+
 class PostgresResultSheet(SequenceSheet):
     rowtype = "rows"
 
@@ -396,6 +424,13 @@ def install_postgres_commands() -> None:
     setattr(visidata.BaseSheet, "_jusi_postgres_commands_v1", True)
 
 
+def _initialize_visidata_application() -> None:
+    from jusi.visidata_support import initialize_visidata
+
+    initialize_visidata(open_name="selection.sql", open_filetype="sql")
+    install_postgres_commands()
+
+
 def _queue_sheet(sheet: PostgresResultSheet) -> None:
     _PENDING_SHEETS.append(sheet)
     vd.queueCommand("jusi-postgres-open-pending-sheet")
@@ -540,10 +575,7 @@ def _handle_application_operation(session: PostgresSession, operation: str, payl
 def run_postgres_application(payload_path: Path, socket_path: str) -> int:
     session: PostgresSession | None = None
     try:
-        from jusi.plugins.vd.application import install_editor_actions
-
-        install_postgres_commands()
-        install_editor_actions()
+        _initialize_visidata_application()
         visidata.vd.timeouts_before_idle = -1
         payload = _read_payload(payload_path)
         query = str(payload.get("sql", "")).strip() or POSTGRES_BOOTSTRAP_SQL

{jusi_postgres-0.2.0 → jusi_postgres-0.2.1}/tests/test_plugin.py

@@ -12,7 +12,7 @@ import pytest
 
 from jusi.plugin_api import OperationRejected, WorkerContext
 from jusi.protocol import validate_plugin_kernel_message
-from jusi_sql import CompletionColumn, CompletionObject, MetadataSnapshot, find_sql_actions
+from jusi_sql import CompletionColumn, CompletionObject, MetadataSnapshot, SqlCompletionRequest, find_sql_actions
 from jusi_sql.kernel import _reset_runtime_for_tests, dispatch_sql
 
 from jusi_postgres.catalog import catalog_entry
@@ -24,9 +24,11 @@ from jusi_postgres.runner import (
     PostgresResultSheet,
     PostgresSession,
     RawBinaryValue,
+    _complete_postgres_sql,
     _connect_psycopg,
     _display_row,
     _followup_sql,
+    _initialize_visidata_application,
     _looks_like_result_query,
     _write_raw_value_file,
 )
@@ -120,6 +122,59 @@ def test_followup_preserves_literal_sql_but_removes_magic_header() -> None:
     assert _followup_sql("%%sql analytics\nselect α") == "select α"
 
 
+def test_blank_relation_completion_returns_only_schemas() -> None:
+    prefix = "select * from "
+    request = SqlCompletionRequest(prefix, prefix, len(prefix), 0, len(prefix))
+    snapshot = MetadataSnapshot(
+        schemas=["demo", "public"],
+        objects=[CompletionObject("accounts", "demo", "table")],
+        columns=[CompletionColumn("accounts", "email", "demo", "text")],
+        functions=[CompletionObject("decode_event", "demo", "function")],
+    )
+
+    result = _complete_postgres_sql(snapshot, request)
+
+    assert [(item["text"], item["kind"]) for item in result["items"]] == [
+        ("demo", "schema"),
+        ("public", "schema"),
+    ]
+    assert {(item["start"], item["end"]) for item in result["items"]} == {
+        (len(prefix), len(prefix)),
+    }
+
+
+def test_typed_relation_completion_keeps_matching_metadata() -> None:
+    prefix = "select * from acc"
+    request = SqlCompletionRequest(prefix, prefix, len(prefix), 0, len(prefix))
+    snapshot = MetadataSnapshot(
+        schemas=["demo"],
+        objects=[CompletionObject("accounts", "demo", "table")],
+    )
+
+    result = _complete_postgres_sql(snapshot, request)
+
+    assert "accounts" in {item["text"] for item in result["items"]}
+
+
+def test_application_loads_visidata_config_before_provider_commands(monkeypatch) -> None:  # type: ignore[no-untyped-def]
+    calls = []
+    monkeypatch.setattr(
+        "jusi.visidata_support.initialize_visidata",
+        lambda **kwargs: calls.append(("initialize", kwargs)),
+    )
+    monkeypatch.setattr(
+        "jusi_postgres.runner.install_postgres_commands",
+        lambda: calls.append(("commands", {})),
+    )
+
+    _initialize_visidata_application()
+
+    assert calls == [
+        ("initialize", {"open_name": "selection.sql", "open_filetype": "sql"}),
+        ("commands", {}),
+    ]
+
+
 def test_worker_returns_one_terminal_and_delegates_to_family_router(monkeypatch) -> None:  # type: ignore[no-untyped-def]
     monkeypatch.setattr("jusi_postgres.worker.find_spec", lambda _name: object())
     worker = create_worker(worker_context())