pgdevkit 0.3.4__py3-none-any.whl → 0.3.8__py3-none-any.whl

pgdevkit/cli.py

@@ -371,24 +371,36 @@ def migrate_apply(
             break
         already_done = False
         if ask:
-            bar_write(f"\n=== {path.name} ===")
-            bar_write(path.read_text(encoding="utf-8"))
-            answer = typer.prompt("[Y]es execute / [n]o skip / [a]lready done / [q]uit", default="y").strip().lower()
-            if answer in ("q", "quit"):
-                quit_requested = True
-                break
-            if answer in ("n", "no"):
-                bar_write(f"Skipped {path.name}")
-                outcomes.append((path.name, "skipped"))
-                bar_step()
-                continue
-            if answer in ("a", "already", "already done"):
-                already_done = True
-            elif answer not in ("", "y", "yes"):
-                bar_write(f"Skipped {path.name}")
-                outcomes.append((path.name, "skipped"))
-                bar_step()
-                continue
+            already_done = migrate.already_fully_applied(conninfo, path)
+            if already_done:
+                bar_write(f"Auto: {path.name} is already fully present in the database — marking as already done")
+            else:
+                # Hold the lock across the whole show-file+prompt step (not just each write) so
+                # the worker's bar_write() calls block until the question is answered instead
+                # of interleaving with the prompt or the migration text while it's being read.
+                with bar_lock:
+                    bar.write(f"\n=== {path.name} ===")
+                    bar.write(path.read_text(encoding="utf-8"))
+                    answer = (
+                        typer.prompt("[Y]es execute / [n]o skip / [a]lready done / [q]uit", default="y")
+                        .strip()
+                        .lower()
+                    )
+                if answer in ("q", "quit"):
+                    quit_requested = True
+                    break
+                if answer in ("n", "no"):
+                    bar_write(f"Skipped {path.name}")
+                    outcomes.append((path.name, "skipped"))
+                    bar_step()
+                    continue
+                if answer in ("a", "already", "already done"):
+                    already_done = True
+                elif answer not in ("", "y", "yes"):
+                    bar_write(f"Skipped {path.name}")
+                    outcomes.append((path.name, "skipped"))
+                    bar_step()
+                    continue
 
         work_q.put((path, already_done))
 

pgdevkit/fetch_missing.py

@@ -9,7 +9,7 @@ import psycopg
 
 from .diff import DiffKind, compute_diff
 from .introspect import introspect_db
-from .parser import parse_directory
+from .parser import IGNORED_DIR_NAMES, parse_directory
 
 _LAYER_PREFIX_RE = re.compile(r"^\d+_?")
 
@@ -41,7 +41,7 @@ def layer_folder_for(scripts_dir: Path, schema: str) -> Path:
     if no existing folder matches."""
     if scripts_dir.is_dir():
         for entry in scripts_dir.iterdir():
-            if not entry.is_dir() or entry.name in ("migrations", "_migration_scripts"):
+            if not entry.is_dir() or entry.name in ("migrations", "_migration_scripts") or entry.name in IGNORED_DIR_NAMES:
                 continue
             if _LAYER_PREFIX_RE.sub("", entry.name).lower() == schema.lower():
                 return entry

pgdevkit/migrate.py

@@ -197,6 +197,83 @@ def _created_table_names(stmts: list[str]) -> list[str]:
     return names
 
 
+_ADD_COLUMN_RE = re.compile(
+    rf"ALTER\s+TABLE\s+(?:IF\s+EXISTS\s+)?([\w.\"]+)\s+ADD\s+COLUMN\s+"
+    rf"(?:IF\s+NOT\s+EXISTS\s+)?\"?({_IDENTIFIER})\"?",
+    re.IGNORECASE,
+)
+_CREATE_RELATION_RE = re.compile(
+    r"CREATE\s+(?:UNIQUE\s+)?INDEX\s+(?:CONCURRENTLY\s+)?(?:IF\s+NOT\s+EXISTS\s+)?([\w.\"]+)"
+    r"|CREATE\s+SEQUENCE\s+(?:IF\s+NOT\s+EXISTS\s+)?([\w.\"]+)"
+    r"|CREATE\s+(?:MATERIALIZED\s+)?VIEW\s+(?:IF\s+NOT\s+EXISTS\s+)?([\w.\"]+)",
+    re.IGNORECASE,
+)
+_CREATE_SCHEMA_RE = re.compile(r"CREATE\s+SCHEMA\s+(?:IF\s+NOT\s+EXISTS\s+)?([\w\"]+)", re.IGNORECASE)
+
+
+def _idempotent_target(stmt: str) -> tuple[str, ...] | None:
+    """Classify a single statement as one of the create-if-missing DDL shapes this module
+    can check for "already applied" with no ambiguity: ("relation", name) for a table,
+    index, sequence or view; ("schema", name); or ("column", table, column) for an ADD
+    COLUMN. None if the statement isn't one of these shapes — including any CREATE OR
+    REPLACE, which is never safe to treat as a no-op just because the object exists, since
+    the migration could be replacing it with different content."""
+    stripped = _strip_line_comments(stmt).strip()
+    if re.search(r"\bOR\s+REPLACE\b", stripped, re.IGNORECASE):
+        return None
+
+    if re.match(r"CREATE\s+TABLE\b", stripped, re.IGNORECASE):
+        names = _created_table_names([stmt])
+        return ("relation", names[0]) if names else None
+
+    m = _CREATE_RELATION_RE.match(stripped)
+    if m:
+        name = next(g for g in m.groups() if g is not None)
+        return ("relation", name)
+
+    m = _CREATE_SCHEMA_RE.match(stripped)
+    if m:
+        return ("schema", m.group(1))
+
+    m = _ADD_COLUMN_RE.match(stripped)
+    if m:
+        return ("column", m.group(1), m.group(2))
+
+    return None
+
+
+def _target_exists(con: psycopg.Connection, target: tuple[str, ...]) -> bool:
+    kind = target[0]
+    if kind == "relation":
+        row = con.execute("select to_regclass(%s)", (target[1],)).fetchone()
+    elif kind == "schema":
+        row = con.execute("select to_regnamespace(%s)", (target[1],)).fetchone()
+    else:  # column
+        row = con.execute(
+            "select 1 from pg_attribute where attrelid = to_regclass(%s) "
+            "and attname = %s and not attisdropped",
+            (target[1], target[2]),
+        ).fetchone()
+    return bool(row and row[0])
+
+
+def already_fully_applied(conninfo: str, path: Path) -> bool:
+    """Whether every statement in this migration is a recognized create-if-missing shape
+    (table/index/sequence/view/schema, or add-column) AND its target already exists in the
+    database — i.e. re-running the migration would do nothing. Used by `--ask` to
+    auto-answer "already done" without prompting, so migrations that are trivially no-ops
+    don't interrupt review. A single unrecognized or not-yet-applied statement means
+    False — this never guesses."""
+    stmts = _split_sql(path.read_text(encoding="utf-8"))
+    if not stmts:
+        return False
+    targets = [_idempotent_target(s) for s in stmts]
+    if any(t is None for t in targets):
+        return False
+    with psycopg.connect(conninfo) as con:
+        return all(_target_exists(con, cast(tuple[str, ...], t)) for t in targets)
+
+
 def list_migration_files(migrations_dir: Path) -> list[Path]:
     return sorted(migrations_dir.glob("*.sql"))
 

pgdevkit/parser.py

@@ -15,6 +15,14 @@ from .models import (
 
 logger = logging.getLogger(__name__)
 
+# Tooling/scratch dirs that can end up inside a database/ tree (e.g. git
+# worktrees checked out under database/.worktree for isolated test DBs) but
+# never hold real schema content.
+IGNORED_DIR_NAMES = {
+    ".worktree", ".worktrees", ".claude", ".vscode", "node_modules",
+    "__pycache__", ".pytest_cache", ".mypy_cache", ".ruff_cache",
+}
+
 # Regex to extract dollar-quoted body (Postgres-only construct)
 _DOLLAR_BODY = re.compile(r'\$(\w*)\$(.*?)\$\1\$', re.DOTALL | re.IGNORECASE)
 
@@ -35,6 +43,8 @@ def parse_directory(scripts_dir: Path, *, dialect: str | Dialect = "postgres") -
     resolved = resolve_dialect(dialect)
     db_schema = DatabaseSchema()
     for sql_file in sorted(scripts_dir.rglob("*.sql")):
+        if IGNORED_DIR_NAMES.intersection(sql_file.relative_to(scripts_dir).parts[:-1]):
+            continue
         _parse_file(sql_file, db_schema, resolved)
     return db_schema
 

pgdevkit/testdb/schema.py

@@ -15,6 +15,7 @@ from psycopg.sql import SQL, Identifier, Placeholder
 
 from ..db.complex_types import ComplexHelper
 from ..dialect import Dialect, POSTGRES
+from ..parser import IGNORED_DIR_NAMES
 
 logger = logging.getLogger(__name__)
 logging.getLogger("sqlglot").setLevel(logging.ERROR)
@@ -121,7 +122,8 @@ def _get_sql_deps(sql: str, dialect: Dialect = POSTGRES) -> set[str]:
 def _iter_sql_files(database_dir: Path, dialect: Dialect = POSTGRES):
     """Yield (Path, sql_content) pairs in dependency-safe execution order."""
     files: list[Path] = []
-    for root, _, dbfiles in os.walk(database_dir):
+    for root, dirs, dbfiles in os.walk(database_dir):
+        dirs[:] = [d for d in dirs if d not in IGNORED_DIR_NAMES]
         if "_migration_scripts" in root or "migrations" in root:
             continue
         for file in dbfiles:

{pgdevkit-0.3.4.dist-info → pgdevkit-0.3.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pgdevkit
-Version: 0.3.4
+Version: 0.3.8
 Summary: A helper for developing with Postgres
 Requires-Python: >=3.14
 Requires-Dist: docker>=7.1.0

{pgdevkit-0.3.4.dist-info → pgdevkit-0.3.8.dist-info}/RECORD

@@ -1,15 +1,15 @@
 pgdevkit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pgdevkit/cli.py,sha256=OKNFAq2PSr_ICWRKRK_9hAvvNnILd_KSUVXH_g2FgiE,16839
+pgdevkit/cli.py,sha256=xP4fZB0Dg3wivhb00DcP2w2Vnp8BRyaR2o1wD7jopFc,17574
 pgdevkit/connection.py,sha256=x49aXKsJfyOsDTlqURs9idQUWaD-RO-XdtAqsG3guBI,4000
 pgdevkit/dialect.py,sha256=PL5Y8QPZNnoHIvAPomczGQX7IjZwxMgKGuREX80SwFA,3105
 pgdevkit/diff.py,sha256=Y2TbjwpFHYik0wZDhoI--9EAlIfp4AUg8BUubkOXyUg,9295
-pgdevkit/fetch_missing.py,sha256=1-2NBDCQNtirywO9Ucm775UKSACfAzcnQlp-4Jh2weE,8136
+pgdevkit/fetch_missing.py,sha256=soSNqnbA06A0-b_OI7plf772eurFVfYNz20EGO6BxO8,8190
 pgdevkit/introspect.py,sha256=QYIlRuZk4lBHGxaW7zb_kFRIuNfi3AxH0Q2F_GKzlVI,7870
 pgdevkit/lakebase.py,sha256=0PABOk4p-2klLTY8QAUibQf9QeyNHKywUWEWGdkUY8k,3165
-pgdevkit/migrate.py,sha256=FmGawqgLZzIPcKvKQABddtn-_-EaiadxRe6mLwxR1Fs,10417
+pgdevkit/migrate.py,sha256=pU7xVssJiAHfFFU60DP2cwpjQ1Tf8Hscc_Q6wIqeSfM,13677
 pgdevkit/models.py,sha256=dAZ8f7pgDsxoLVrDWsM4h0qwJ0pOzXDdWMGsnjrW80E,2103
 pgdevkit/mssql_introspect.py,sha256=Fhv1N4zHYEDZ0PEy0OIpawUmoIFeoi-Lm97pmEyDmYY,12031
-pgdevkit/parser.py,sha256=X1P8RbogRhsWc-H9w3IPlDo2blKpI33cJTvDzOXze1Y,15367
+pgdevkit/parser.py,sha256=gbXqp5vlCD-JxlvENuJtGIuFvL3U6ndeBOySgkwWPzw,15820
 pgdevkit/backends/__init__.py,sha256=ys4VBglMImRtnudJBlTPVBNevDMRippuwAJOz0yRKiY,610
 pgdevkit/backends/base.py,sha256=0i0KLCYVWlpVFnUoq2t0LCRE_abyWPPIhw1bMxmW9KQ,1048
 pgdevkit/backends/mssql.py,sha256=pocBdoQ14ZnYLutXEOStVmJvmpclXGs3gaxHN0uJCMk,1068
@@ -30,7 +30,7 @@ pgdevkit/testdb/constants.py,sha256=xi8uIoEgN9LrRkr41j3mmWB9PqqU0r8aCUb2JJXBAs0,
 pgdevkit/testdb/container.py,sha256=kELTb6qaECAO9a5Bwvx1btv6i5QKRFAa9PX6auWymNo,2807
 pgdevkit/testdb/naming.py,sha256=Kyk5qEfxUkbggUG5bD7U7CJ_kAET332VPQNB-O5kvTY,1318
 pgdevkit/testdb/query.py,sha256=iYpy_EoYIq5USfwr6pNktmDjcGi_yQx0vHvjHZNGRr0,3854
-pgdevkit/testdb/schema.py,sha256=vw75HsiMvZPmMWaD5P2DeOaEKS86qksRXHDtOc8SjJE,11941
+pgdevkit/testdb/schema.py,sha256=0N0Q_BQGh2kuAqa_j-DdbjYlTUOOZSEtaoUOApxQg_Y,12049
 pgdevkit/testdb/mssql/__init__.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
 pgdevkit/testdb/mssql/api.py,sha256=42RAuJeiZlK1WJaTIYoj6l8GEAbEyt6LgAoF3G2jxnw,7537
 pgdevkit/testdb/mssql/constants.py,sha256=7n_NcYuhabbtb18CqG_H_rRbI7Wb_qu_l4nKk3281vI,2847
@@ -39,7 +39,7 @@ pgdevkit/docs/database-layout.md,sha256=4GBwv4PA2cKHl2BxwLd-awLOe9he9ie4X6CpQWjI
 pgdevkit/skills/pgdevkit/SKILL.md,sha256=6uxe6BQwOLexGiBpf00VTFTHOiWJo5k2Qqzu172rb4I,12156
 pgdevkit/skills/pgdevkit/references/dynamic-sql.md,sha256=aTR1sx81moiTwaMaiOecaqk-9rT8y5Zxz7W1BoC3vK0,2774
 pgdevkit/skills/pgdevkit/references/temporal-tables.md,sha256=LwZnItvQWI7bB0oRHxIfUc0ynnq7N0V5Mnv-QHvFN3Q,1364
-pgdevkit-0.3.4.dist-info/METADATA,sha256=YPVRf3mQo-OV1PpCL0rNv6SbHiv3y7-ic5Z1BTMrc50,11346
-pgdevkit-0.3.4.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-pgdevkit-0.3.4.dist-info/entry_points.txt,sha256=FK2P55lf0WaGlOZJIINOGgCt8WB7ep0OnPsgnrp80bg,42
-pgdevkit-0.3.4.dist-info/RECORD,,
+pgdevkit-0.3.8.dist-info/METADATA,sha256=jQlfYkvzEolSPiofscelGtur9rzWQClSvOMQxIuc7Uo,11346
+pgdevkit-0.3.8.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+pgdevkit-0.3.8.dist-info/entry_points.txt,sha256=FK2P55lf0WaGlOZJIINOGgCt8WB7ep0OnPsgnrp80bg,42
+pgdevkit-0.3.8.dist-info/RECORD,,