fix: preserve Task 2 command loading contracts

This commit is contained in:
2026-08-11 06:31:12 +02:00
parent 9e2c2b37b3
commit f62b4dbc4c
5 changed files with 279 additions and 86 deletions
@@ -1,4 +1,8 @@
# ruff: noqa: DTZ001
import json
import subprocess
import sys
import textwrap
import warnings
from datetime import datetime
@@ -510,3 +514,90 @@ def test_staged_sql_oversize_read_is_bounded(tmp_path, monkeypatch):
with pytest.raises(_MachineSchemaError, match="staged_sql_too_large"):
_read_staged_sql([staged])
assert reads == [(1 << 20) + 1]
def test_staged_sql_deduplicates_overlapping_roots_and_repeated_files(tmp_path):
from tht.cli.schema_cmd import _staged_sql_files
root = tmp_path / "approved"
nested = root / "nested"
nested.mkdir(parents=True)
first = root / "first.sql"
second = nested / "second.sql"
first.write_text("SELECT 1")
second.write_text("SELECT 1")
files = _staged_sql_files([root, nested, first, root])
assert files == sorted({first.resolve(), second.resolve()})
def test_staged_sql_file_limit_counts_distinct_paths_only(tmp_path):
from tht.cli.schema_cmd import _MachineSchemaError, _staged_sql_files
path = tmp_path / "same.sql"
path.write_text("SELECT 1")
assert _staged_sql_files([path] * 100) == [path.resolve()]
root = tmp_path / "many"
root.mkdir()
for index in range(33):
(root / f"q{index:02d}.sql").write_text("SELECT 1")
with pytest.raises(_MachineSchemaError, match="staged_sql_too_many"):
_staged_sql_files([root])
def test_fresh_process_human_warning_cardinality_is_one_across_failure_and_write_paths(tmp_path):
cfg = _write_workspace(tmp_path)
physical = tmp_path / "artifacts" / "mschema" / "physical.yaml"
annotations = tmp_path / "artifacts" / "mschema" / "annotations.yaml"
annotations.parent.mkdir(parents=True, exist_ok=True)
Annotations().to_yaml(annotations)
probe = textwrap.dedent(
"""
import json, sys, warnings
from typer.testing import CliRunner
from tht.cli import app
with warnings.catch_warnings(record=True) as caught:
warnings.simplefilter("always")
result = CliRunner().invoke(app, sys.argv[1:])
print(json.dumps({
"warnings": sum(issubclass(w.category, FutureWarning) for w in caught),
"exit": result.exit_code,
}))
"""
)
physical.unlink()
branches = [
["schema", "check"],
["schema", "suggest-fks"],
["vector", "index-schema"],
]
for branch in branches:
response = subprocess.run(
[sys.executable, "-c", probe, *branch, "-c", str(cfg)],
check=True, capture_output=True, text=True,
)
assert json.loads(response.stdout) == {"warnings": 1, "exit": 1}
_physical().to_yaml(physical)
response = subprocess.run(
[sys.executable, "-c", probe, "schema", "suggest-fks", "--write", "-c", str(cfg)],
check=True, capture_output=True, text=True,
)
assert json.loads(response.stdout) == {"warnings": 1, "exit": 0}
physical.unlink()
for branch in branches:
response = subprocess.run(
[sys.executable, "-c", probe, *branch, "--json", "-c", str(cfg)],
check=True, capture_output=True, text=True,
)
assert json.loads(response.stdout)["warnings"] == 0
response = subprocess.run(
[sys.executable, "-c", probe, "schema", "suggest-fks", "--write", "--json", "-c", str(cfg)],
check=True, capture_output=True, text=True,
)
assert json.loads(response.stdout)["warnings"] == 0