dbconform 0.2.0__tar.gz → 0.2.2__tar.gz

{dbconform-0.2.0/src/dbconform.egg-info → dbconform-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbconform
-Version: 0.2.0
+Version: 0.2.2
 Summary: Synchronize database schema to models — document-driven project.
 Author: Brian L. Pond
 License: MIT

{dbconform-0.2.0 → dbconform-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dbconform"
-version = "0.2.0"
+version = "0.2.2"
 description = "Synchronize database schema to models — document-driven project."
 readme = "README.md"
 license = { text = "MIT" }
@@ -61,7 +61,7 @@ where = ["src"]
 dbconform = "dbconform.cli:main"
 
 [tool.commitizen]
-version = "0.2.0"
+version = "0.2.2"
 version_scheme = "semver"
 commit = true
 tag = true

{dbconform-0.2.0 → dbconform-0.2.2}/src/dbconform/cli.py

@@ -17,41 +17,21 @@ from pathlib import Path
 try:
     import typer
 except ImportError:
-    print("To enable the CLI, install dbconform with optional development packages:\n\tpip install dbconform[dev]", # noqa: E501
-          file=sys.stderr)
+    print(
+        "To enable the CLI, install dbconform with optional development packages:\n\tpip install dbconform[dev]",  # noqa: E501
+        file=sys.stderr,
+    )
     sys.exit(1)
 
 
+from dbconform.sql_dialect.postgresql import try_connect_to_postgres
+
+
 # Container constants (match tests/docker-compose.yml image)
 POSTGRES_IMAGE = "postgres:16-alpine"
 CONTAINER_NAME = "dbconform-postgres"
 POSTGRES_PORT = 15432
 POSTGRES_URL = f"postgresql://postgres:postgres@127.0.0.1:{POSTGRES_PORT}/postgres"
-
-
-def _try_connect_postgres(url: str, timeout: float = 5.0) -> tuple[bool, str | None]:
-    """
-    Try to connect to Postgres at url (postgresql:// or postgresql+psycopg://),
-    run SELECT 1 to validate auth and database. Returns (True, None) on success;
-    (False, error_message) on failure. Requires psycopg; returns (False, 'psycopg not installed')
-    if missing.
-    """
-    try:
-        import psycopg
-    except ImportError:
-        return (False, "psycopg not installed")
-    conninfo = url.replace("postgresql+psycopg://", "postgresql://", 1)
-    try:
-        with psycopg.connect(conninfo, connect_timeout=timeout) as conn, conn.cursor() as cur:
-            cur.execute("SELECT 1")
-            cur.fetchone()
-        return (True, None)
-    except psycopg.OperationalError as e:
-        return (False, str(e).strip())
-    except Exception as e:
-        return (False, str(e).strip())
-
-
 def _get_container_runtime_path_or_none() -> str | None:
     """Return docker or podman path if available, else None. Does not echo or exit."""
     cmd = os.environ.get("DBCONFORM_CONTAINER_CMD", "").strip()
@@ -122,7 +102,7 @@ def show_version() -> None:
             "dbconform package version is unknown (distribution not installed).",
             err=True,
         )
-        raise typer.Exit(1)
+        raise typer.Exit(1)  # noqa: B904
     typer.echo(v)
 
 
@@ -205,7 +185,7 @@ def _ensure_postgres_container_up(container_cmd: str) -> bool:
     Cleans up partially-created containers on failure.
     """
     if _container_running(container_cmd):
-        ok, _ = _try_connect_postgres(POSTGRES_URL, timeout=3)
+        ok, _ = try_connect_to_postgres(POSTGRES_URL, timeout=3)
         return ok
     if _container_exists(container_cmd):
         _run_subprocess([container_cmd, "start", CONTAINER_NAME], timeout=10)
@@ -230,7 +210,7 @@ def _ensure_postgres_container_up(container_cmd: str) -> bool:
             return False
     deadline = time.monotonic() + 30
     while time.monotonic() < deadline:
-        ok, err_msg = _try_connect_postgres(POSTGRES_URL, timeout=3)
+        ok, err_msg = try_connect_to_postgres(POSTGRES_URL, timeout=3)
         if ok:
             return True
         if err_msg and "password authentication failed" in err_msg:
@@ -299,7 +279,7 @@ def postgres_up() -> None:
             typer.echo(f"Start failed: {err}", err=True)
         raise typer.Exit(1)
     # Wait for Postgres to accept TCP connections with our password (up to 30s)
-    ok, err_msg = _try_connect_postgres(POSTGRES_URL, timeout=3)
+    ok, err_msg = try_connect_to_postgres(POSTGRES_URL, timeout=3)
     if err_msg == "psycopg not installed":
         typer.echo(f"Set: DBCONFORM_TEST_POSTGRES_URL={POSTGRES_URL}")
         typer.echo(
@@ -308,7 +288,7 @@ def postgres_up() -> None:
         return
     deadline = time.monotonic() + 30
     while time.monotonic() < deadline:
-        ok, err_msg = _try_connect_postgres(POSTGRES_URL, timeout=3)
+        ok, err_msg = try_connect_to_postgres(POSTGRES_URL, timeout=3)
         if ok:
             typer.echo(f"Set: DBCONFORM_TEST_POSTGRES_URL={POSTGRES_URL}")
             typer.echo("Connection verified (SELECT 1).")

{dbconform-0.2.0 → dbconform-0.2.2}/src/dbconform/sql_dialect/postgresql.py

@@ -223,13 +223,18 @@ class PostgreSQLDialect(Dialect):
 
     def normalize_reflected_table(self, table_def: TableDef) -> TableDef:
         """
-        Normalize reflected table so SERIAL/sequence columns compare equal to model.
+        Normalize reflected table so it compares equal to model-side internal schema.
 
-        Columns with a sequence default (nextval) and integer-like type are rewritten
-        to default=None, autoincrement=True, data_type_name=INTEGER|BIGINT so they match
-        the model's representation and no spurious ALTER steps are emitted.
+        - Columns with a sequence default (nextval) and integer-like type are rewritten
+          to default=None, autoincrement=True, data_type_name=INTEGER|BIGINT so they match
+          the model's representation and no spurious ALTER steps are emitted.
+        - Implicit single-column UNIQUE constraints (e.g. habitat.name created from
+          column unique=True) are given auto-generated names like habitat_name_key
+          in PostgreSQL. Model-side UniqueDef for such constraints has name=None,
+          so we strip the auto-generated name here to avoid drop/add churn on recompare.
         """
         INTEGER_LIKE = ("SERIAL", "INTEGER", "BIGSERIAL", "BIGINT", "INT8")
+
         new_columns: list[ColumnDef] = []
         for col in table_def.columns:
             if (
@@ -266,13 +271,50 @@ class PostgreSQLDialect(Dialect):
                         autoincrement=False,
                     )
                 )
+
+        # Normalize unique constraint names for implicit single-column uniques.
+        new_uniques: list[UniqueDef] = []
+        table_name = table_def.name.name
+        for u in table_def.unique_constraints:
+            name = u.name
+            if name and len(u.column_names) == 1:
+                col = u.column_names[0]
+                auto_name = f"{table_name}_{col}_key"
+                if name == auto_name:
+                    # Match model-side representation where name is None for column unique=True.
+                    name = None
+            new_uniques.append(UniqueDef(name=name, column_names=u.column_names))
+
         return TableDef(
             name=table_def.name,
             columns=tuple(new_columns),
             primary_key=table_def.primary_key,
-            unique_constraints=table_def.unique_constraints,
+            unique_constraints=tuple(new_uniques),
             foreign_keys=table_def.foreign_keys,
             check_constraints=table_def.check_constraints,
             indexes=table_def.indexes,
             comment=table_def.comment,
         )
+
+
+def try_connect_to_postgres(url: str, timeout: float = 5.0) -> tuple[bool, str | None]:
+    """
+    Try to connect to Postgres at url (postgresql:// or postgresql+psycopg://),
+    run SELECT 1 to validate auth and database. Returns (True, None) on success;
+    (False, error_message) on failure. Requires psycopg; returns (False, 'psycopg not installed')
+    if missing.
+    """
+    try:
+        import psycopg
+    except ImportError:
+        return (False, "psycopg not installed")
+    conninfo = url.replace("postgresql+psycopg://", "postgresql://", 1)
+    try:
+        with psycopg.connect(conninfo, connect_timeout=timeout) as conn, conn.cursor() as cur:
+            cur.execute("SELECT 1")
+            cur.fetchone()
+        return (True, None)
+    except psycopg.OperationalError as e:
+        return (False, str(e).strip())
+    except Exception as e:
+        return (False, str(e).strip())

{dbconform-0.2.0 → dbconform-0.2.2/src/dbconform.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbconform
-Version: 0.2.0
+Version: 0.2.2
 Summary: Synchronize database schema to models — document-driven project.
 Author: Brian L. Pond
 License: MIT