sql-code-graph 1.34.0__py3-none-any.whl → 1.34.1__py3-none-any.whl

{sql_code_graph-1.34.0.dist-info → sql_code_graph-1.34.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sql-code-graph
-Version: 1.34.0
+Version: 1.34.1
 Summary: SQL code graph analyzer and lineage tracer
 Project-URL: Homepage, https://github.com/Warhorze/sql-code-graph
 Project-URL: Repository, https://github.com/Warhorze/sql-code-graph

{sql_code_graph-1.34.0.dist-info → sql_code_graph-1.34.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-sqlcg/__init__.py,sha256=2T8VTIp-T6SnT3Yg3veGg8ucJmETIyfJ2e1VhoKrDYU,116
+sqlcg/__init__.py,sha256=41PZf0zcZBhUQbwRo78_ftWrsT-lF8uXFf2sQm3NIKc,116
 sqlcg/__main__.py,sha256=1YoFLcqEgTwYq1J3TbUwpkdG0zeeLIf2fJvwWI-CLFU,109
 sqlcg/cli/__init__.py,sha256=W8fD0LpMq2xm_5WKGNMvJh2WBL1ho5E8hUeAqXQYT1g,28
 sqlcg/cli/coverage.py,sha256=Xm9ITzZDHv2mJ70Q5jCacVuhDStVrE3gq12_-Ypvtd8,43823
@@ -9,11 +9,11 @@ sqlcg/cli/commands/catalog.py,sha256=xCIWp_9xcDPHIMUB0xrZR3-G0WMvKbfq4yMwe2sDT2g
 sqlcg/cli/commands/db.py,sha256=QEDPs0boeFe8ETE8BWe7I2JLSXROUI571SHXMTUqxh8,7982
 sqlcg/cli/commands/find.py,sha256=uMdG08bU-AvB9RqsTKPfdVnJet7b3Ebj0xbsjqTclYA,2678
 sqlcg/cli/commands/gain.py,sha256=PQCWjlisjUY4Gz_MkppXPI1_w8xsB4DPlN7uAxx0GvY,10149
-sqlcg/cli/commands/git.py,sha256=OCqq5ApKgOyYouC_olJoyugaS2jsvEkq5MEcmFAXXEo,7255
+sqlcg/cli/commands/git.py,sha256=IB6Pypo_0RYd8rsKQLdP73OnlZUidZJ8_czQe1SNdOc,8857
 sqlcg/cli/commands/index.py,sha256=KGy0vPlvFcMetBjT5wIEvEcy9MEcLt7lhNaKfRWUkgU,19502
 sqlcg/cli/commands/install.py,sha256=4aZzvDNdl2Ea5v-ufR8Oj1qq30oGS_9jX17etYpoan8,10148
 sqlcg/cli/commands/mcp.py,sha256=drh5udcroZFddmJAG3q9JWxekDqTO9H4xC-oIqiis-Y,14871
-sqlcg/cli/commands/reindex.py,sha256=pNBonQYUhHwfJFWJjWq_uQorMmTcJ9HRT1MNH6v_YYo,19357
+sqlcg/cli/commands/reindex.py,sha256=6j1QL3TjrsnWaFSIKvpGJ3LF8CoCjAbue0UFtmk9FS0,22704
 sqlcg/cli/commands/report.py,sha256=JU0qjyMxwOukE7bN3XvvIzOI7zMg_Gsnvk_8F6pKNpA,4915
 sqlcg/cli/commands/uninstall.py,sha256=WrA1FnINxnd6mmE4-_QBK0aHBnibstJeAT8swnQKG4M,8962
 sqlcg/cli/commands/watch.py,sha256=_OvUQ4m_Pp2lAzI_f9UX2Gwb56zbsaSC4Tj8h51uciA,2806
@@ -65,7 +65,7 @@ sqlcg/utils/__init__.py,sha256=--iqt5ThTXmT8Wz7da8hs3n0zDfYPl8P-z5OgRJ_77E,154
 sqlcg/utils/hashing.py,sha256=H25-sYfxHKb3_IERFnHyAIYNiXN470Oqo5sJT_D3YOA,438
 sqlcg/utils/ignore.py,sha256=6__DfiYgynI2b8nH52O2BzI1EZcZ_LRazhqEOJVGGcE,1955
 sqlcg/utils/logging.py,sha256=u0fCmYsLj9o81vawm3xZTHaw68GQYVm7JxG-gP81u8A,840
-sql_code_graph-1.34.0.dist-info/METADATA,sha256=8Upovle3wZwH5UCvVxmYTOMtZDXUjPBeeDLixMzd5wQ,17791
-sql_code_graph-1.34.0.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-sql_code_graph-1.34.0.dist-info/entry_points.txt,sha256=Wfe49sVzV9p4eVFGo5RxcV-frr3HOP0yzzst8JBxQLQ,46
-sql_code_graph-1.34.0.dist-info/RECORD,,
+sql_code_graph-1.34.1.dist-info/METADATA,sha256=UtXmf-S4GYLSS7MuPpYJxhaJ7fOmbZwSR54RnSyVGPw,17791
+sql_code_graph-1.34.1.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+sql_code_graph-1.34.1.dist-info/entry_points.txt,sha256=Wfe49sVzV9p4eVFGo5RxcV-frr3HOP0yzzst8JBxQLQ,46
+sql_code_graph-1.34.1.dist-info/RECORD,,

sqlcg/__init__.py

@@ -1,5 +1,5 @@
 """SQL Code Graph - SQL lineage and dependency analysis tool."""
 
-__version__ = "1.34.0"
+__version__ = "1.34.1"
 
 __all__ = ["__version__"]

sqlcg/cli/commands/git.py

@@ -23,6 +23,29 @@ class _HookSpec(NamedTuple):
 # Hook script templates — use {sqlcg_bin} as the placeholder for the resolved binary.
 # The sentinel comments (e.g. "# sqlcg post-checkout hook") must stay byte-for-byte
 # unchanged so R9 idempotency is preserved: _install_single_hook matches them verbatim.
+#
+# Run-time binary resolution (#126 + #1): the hook no longer trusts the single embedded
+# absolute literal to stay valid forever (a venv rebuild or tool upgrade makes the
+# install-time path stale and the resync would then run a wrong/missing binary). Instead
+# the shared _RESOLVE_PREAMBLE resolves the binary at *run time* with a hybrid order:
+#   1. the preferred path rendered in at install time ({sqlcg_bin}, normally the stable
+#      user-base binary from _resolve_sqlcg_bin) — the fast path, used if still executable;
+#   2. `command -v sqlcg` on $PATH — covers uv-tool, user-base-on-PATH, and active-venv;
+#   3. neither resolves → print a loud stderr error and exit non-zero (never silent).
+# The shell never recomputes getuserbase() — the preferred path is rendered in by Python.
+# It exports SQLCG_BIN for the hook body to invoke.
+_RESOLVE_PREAMBLE = (
+    'if [ -x "{sqlcg_bin}" ]; then\n'
+    '  SQLCG_BIN="{sqlcg_bin}"\n'
+    "elif command -v sqlcg >/dev/null 2>&1; then\n"
+    '  SQLCG_BIN="$(command -v sqlcg)"\n'
+    "else\n"
+    "  echo \"sqlcg: cannot find the sqlcg binary (tried '{sqlcg_bin}' and \\$PATH)"
+    " -- run 'sqlcg git install-hooks' to repoint this hook\" >&2\n"
+    "  exit 1\n"
+    "fi\n"
+)
+
 _HOOKS: list[_HookSpec] = [
     _HookSpec(
         filename="post-checkout",
@@ -32,7 +55,8 @@ _HOOKS: list[_HookSpec] = [
             "# sqlcg post-checkout hook — incremental resync after branch switch\n"
             "# $3 == 1 means branch checkout (not file checkout); skip file checkouts\n"
             '[ "$3" = "1" ] || exit 0\n'
-            '{sqlcg_bin} reindex --from "$1" --to "$2"'
+            + _RESOLVE_PREAMBLE
+            + '"$SQLCG_BIN" reindex --from "$1" --to "$2"'
             ' "$(git rev-parse --show-toplevel)" --dialect auto --quiet --notify'
             ' || echo "sqlcg: graph not updated (reindex failed)'
             " -- run 'sqlcg mcp status'\" >&2\n"
@@ -41,22 +65,27 @@ _HOOKS: list[_HookSpec] = [
     _HookSpec(
         filename="post-merge",
         sentinel="# sqlcg post-merge hook",
-        script_template="""\
-#!/bin/sh
-# sqlcg post-merge hook — incremental resync after pull/merge
-# git sets ORIG_HEAD to the pre-merge HEAD; pass it as --from so --notify can route
-# through a running server (same path as post-checkout). If ORIG_HEAD is unset (e.g.
-# first-ever merge / gc'd), fall back to the standalone stored-SHA delta (direct write).
-PREV=$(git rev-parse --verify --quiet ORIG_HEAD)
-TOP=$(git rev-parse --show-toplevel)
-if [ -n "$PREV" ]; then
-  {sqlcg_bin} reindex --from "$PREV" --to HEAD "$TOP" --dialect auto --quiet --notify \\
-    || echo "sqlcg: graph not updated (reindex failed) -- run 'sqlcg mcp status'" >&2
-else
-  {sqlcg_bin} reindex "$TOP" --dialect auto --quiet --notify \\
-    || echo "sqlcg: graph not updated (reindex failed) -- run 'sqlcg mcp status'" >&2
-fi
-""",
+        script_template=(
+            "#!/bin/sh\n"
+            "# sqlcg post-merge hook — incremental resync after pull/merge\n"
+            "# git sets ORIG_HEAD to the pre-merge HEAD; pass it as --from so --notify\n"
+            "# can route through a running server (same path as post-checkout). If\n"
+            "# ORIG_HEAD is unset (e.g. first-ever merge / gc'd), fall back to the\n"
+            "# standalone stored-SHA delta (direct write).\n"
+            + _RESOLVE_PREAMBLE
+            + "PREV=$(git rev-parse --verify --quiet ORIG_HEAD)\n"
+            "TOP=$(git rev-parse --show-toplevel)\n"
+            'if [ -n "$PREV" ]; then\n'
+            '  "$SQLCG_BIN" reindex --from "$PREV" --to HEAD "$TOP" --dialect auto'
+            " --quiet --notify \\\n"
+            '    || echo "sqlcg: graph not updated (reindex failed)'
+            " -- run 'sqlcg mcp status'\" >&2\n"
+            "else\n"
+            '  "$SQLCG_BIN" reindex "$TOP" --dialect auto --quiet --notify \\\n'
+            '    || echo "sqlcg: graph not updated (reindex failed)'
+            " -- run 'sqlcg mcp status'\" >&2\n"
+            "fi\n"
+        ),
     ),
 ]
 

sqlcg/cli/commands/reindex.py

@@ -129,6 +129,11 @@ def reindex_cmd(  # noqa: B008
     # below) and return to git immediately. The respawn guard env var prevents
     # the detached child from detaching again.
     if _is_hook_path and os.environ.get(_HOOK_DETACHED_ENV) != "1":
+        # #1 — loud foreground preflight BEFORE detaching. The detached child's
+        # schema gate (below) writes its Exit(1) to the hook-resync log, invisible
+        # to the user, so a stale-binary schema skew dies silently (exit 0 to git).
+        # Surface a real mismatch in the foreground, where git's terminal can see it.
+        _hook_preflight_schema_check()
         _spawn_detached_hook_resync(path)
         return
 
@@ -291,6 +296,66 @@ def _spawn_detached_hook_resync(path: Path) -> None:
     console.print(f"sqlcg: resyncing graph in background (log: {log_path})")
 
 
+def _hook_preflight_schema_check() -> None:
+    """Surface a stale-binary schema/version skew in the FOREGROUND hook process (#1).
+
+    On the hook path the resync is detached (#77), so the existing schema gate
+    (``reindex_cmd`` at ~:150) runs in the detached child whose stdout/stderr go to
+    ``hook-resync.log`` — its ``Exit(1)`` never reaches the user's terminal and the
+    graph silently never refreshes. This preflight runs *before* the detach and, on a
+    REAL mismatch, prints a visible, actionable stderr message and exits non-zero
+    without detaching.
+
+    Git runs post-checkout/post-merge AFTER the operation and ignores the hook exit
+    status, so the **stderr message** is the load-bearing part (not the exit code).
+
+    BOUNDED, FAIL-SOFT open (plan-review B1 — MANDATED). DuckDB takes an exclusive
+    file lock: per ``config.py`` ``get_backend`` docstring, a second process cannot
+    open the DB at all (even read-only) while another holds it — it raises
+    ``duckdb.IOException`` (#63). On rapid successive checkouts a prior detached
+    resync still holds the lock, so this open WILL contend. We therefore do a SINGLE
+    open attempt (NOT ``_open_backend_with_lock_retry``'s ~31 s retry, which would
+    stall ``git checkout`` — a #77-class regression) and, on ``IOException`` (lock
+    held ⇒ a resync is already in flight), treat it as "cannot determine — fall
+    through to the existing detach path unchanged": never block, never emit a
+    schema-mismatch error. Only a SUCCESSFUL read showing a real mismatch triggers
+    the loud exit. The backend is opened read-only and released before returning so
+    the detached child can still acquire the lock.
+    """
+    import duckdb
+
+    from sqlcg.core.config import get_backend
+    from sqlcg.core.schema import SCHEMA_VERSION
+
+    try:
+        backend = get_backend(read_only=True)
+    except duckdb.IOException:
+        # Lock held by an in-flight resync — cannot determine; fall through to detach.
+        return
+
+    try:
+        with backend:
+            stored_version = backend.get_schema_version()
+            if stored_version is None or stored_version == SCHEMA_VERSION:
+                # Matches (or no stored version yet on a fresh graph) — detach as today.
+                return
+            indexed_tool_version = backend.get_indexed_version()
+    except duckdb.IOException:
+        # Lock raced after the open (e.g. closed-then-reopened by the writer);
+        # fail soft exactly as the open-time IOException path.
+        return
+
+    skew = f" (graph last indexed by sqlcg {indexed_tool_version})" if indexed_tool_version else ""
+    print(
+        f"sqlcg: graph schema is v{stored_version} but this tool needs "
+        f"v{SCHEMA_VERSION}{skew} — the hook binary is stale. "
+        "Run 'sqlcg git install-hooks' to repoint the hook, then "
+        "'sqlcg db reset && sqlcg index <root>'.",
+        file=sys.stderr,
+    )
+    raise typer.Exit(1)
+
+
 def _open_backend_with_lock_retry() -> "GraphBackend":
     """Open the DuckDB backend, retrying with backoff if it is locked.