sql-harness 0.2.3__tar.gz → 0.2.4__tar.gz

{sql_harness-0.2.3 → sql_harness-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sql-harness
-Version: 0.2.3
+Version: 0.2.4
 Summary: Single-process SQL + SSH CLI for LLM agents. PostgreSQL/MySQL/SSH via SQLAlchemy + paramiko. Plaintext credentials in one TOML file. Helpers auto-injected into the heredoc namespace.
 Project-URL: Source, https://github.com/zhaoliuxue/much_bigpy/tree/master/lab/sql_harness
 Project-URL: Issues, https://github.com/zhaoliuxue/much_bigpy/issues

{sql_harness-0.2.3 → sql_harness-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sql-harness"
-version = "0.2.3"
+version = "0.2.4"
 description = "Single-process SQL + SSH CLI for LLM agents. PostgreSQL/MySQL/SSH via SQLAlchemy + paramiko. Plaintext credentials in one TOML file. Helpers auto-injected into the heredoc namespace."
 readme = "README.md"
 license = { text = "MIT" }

{sql_harness-0.2.3 → sql_harness-0.2.4}/src/sql_harness/cli.py

@@ -558,6 +558,13 @@ def cmd_save(args, _harness: SqlHarness) -> int:
     conn, code = _require_connection_or_fail(args)
     if code:
         return code
+    # Read stdin as UTF-8 on Windows (default locale is GBK/CP936, which
+    # mangles non-ASCII bytes into surrogates that write_text rejects).
+    # Mirrors run.py's heredoc-mode stdin handling.
+    try:
+        sys.stdin.reconfigure(encoding="utf-8", errors="replace")
+    except (AttributeError, OSError):
+        pass
     body = sys.stdin.read()
     if not body.strip():
         print("error: stdin is empty; nothing to save", file=sys.stderr)
@@ -616,6 +623,9 @@ def cmd_run(args, harness: SqlHarness) -> int:
     for n, v in vars(helpers).items():
         if not n.startswith("_"):
             namespace[n] = v
+    # Parity with heredoc mode (run.py globals): expose `sys` so saved
+    # scripts can use sys.stdout.write etc. without importing it.
+    namespace["sys"] = sys
     code_text = path.read_text(encoding="utf-8")
     try:
         exec(compile(code_text, str(path), "exec"), namespace)

{sql_harness-0.2.3 → sql_harness-0.2.4}/tests/unit/test_cli.py

@@ -10,8 +10,14 @@ from pathlib import Path
 import pytest
 
 
-def _run_cli(*args: str, env: dict | None = None) -> subprocess.CompletedProcess:
-    """Run sql-harness in a subprocess; capture UTF-8 output."""
+def _run_cli(
+    *args: str, env: dict | None = None, input: str | None = None
+) -> subprocess.CompletedProcess:
+    """Run sql-harness in a subprocess; capture UTF-8 output.
+
+    `input` (when given) is piped to the child's stdin as UTF-8 — used to
+    exercise `save`, which reads its heredoc body from stdin.
+    """
     import os
 
     full_env = os.environ.copy()
@@ -24,6 +30,7 @@ def _run_cli(*args: str, env: dict | None = None) -> subprocess.CompletedProcess
         encoding="utf-8",
         errors="replace",
         env=full_env,
+        input=input,
     )
 
 
@@ -219,4 +226,48 @@ def test_open_scripts_requires_connection(tmp_path: Path) -> None:
     """`open scripts` without --connection errors with guidance."""
     p = _run_cli("open", "scripts", env={"BH_SQL_HOME": str(tmp_path)})
     assert p.returncode == 2
-    assert "zone-scoped" in p.stderr
+    assert "zone-scoped" in p.stderr
+
+
+def _write_sqlite_cfg(tmp_path: Path) -> None:
+    """Seed an isolated BH_SQL_HOME with a single sqlite connection."""
+    (tmp_path / "connections.toml").write_text(
+        '[[connections]]\n'
+        'name = "mem"\n'
+        'driver = "sqlite"\n'
+        'url = "sqlite:///:memory:"\n',
+        encoding="utf-8",
+    )
+
+
+def test_save_preserves_utf8_stdin(tmp_path: Path) -> None:
+    """`save` reads stdin as UTF-8 even on Windows (cp936 default locale).
+
+    Regression: non-ASCII bytes in the heredoc body were decoded into
+    surrogates and write_text(utf-8) raised UnicodeEncodeError.
+    """
+    _write_sqlite_cfg(tmp_path)
+    body = "# 服务器内存检查\nprint('ok')\n"
+    p = _run_cli(
+        "save", "utf8", "-c", "mem", input=body, env={"BH_SQL_HOME": str(tmp_path)}
+    )
+    assert p.returncode == 0, p.stderr
+    saved = Path(json.loads(p.stdout)["path"])
+    assert "服务器内存检查" in saved.read_text(encoding="utf-8")
+
+
+def test_run_namespace_exposes_sys(tmp_path: Path) -> None:
+    """`run` exec namespace includes `sys`, matching heredoc mode.
+
+    Regression: saved scripts that used `sys.stdout.write` without
+    `import sys` (as ssh.md documents) failed with NameError.
+    """
+    _write_sqlite_cfg(tmp_path)
+    body = "sys.stdout.write('ok-from-sys')\n"  # relies on pre-imported sys
+    p = _run_cli(
+        "save", "usesys", "-c", "mem", input=body, env={"BH_SQL_HOME": str(tmp_path)}
+    )
+    assert p.returncode == 0, p.stderr
+    p2 = _run_cli("run", "usesys", "-c", "mem", env={"BH_SQL_HOME": str(tmp_path)})
+    assert p2.returncode == 0, p2.stderr
+    assert "ok-from-sys" in p2.stdout

{sql_harness-0.2.3 → sql_harness-0.2.4}/uv.lock

@@ -446,7 +446,7 @@ wheels = [
 
 [[package]]
 name = "sql-harness"
-version = "0.2.2"
+version = "0.2.3"
 source = { editable = "." }
 dependencies = [
     { name = "paramiko" },