Merge pull request #602 from lbedner/v0.6.8-rc5

v0.6.8-rc5

Author: lbedner

CLAUDE.md

@@ -32,7 +32,7 @@ Each generated project includes:
 
 ## Installation
 
-**Current Version**: 0.6.8rc4
+**Current Version**: 0.6.8rc5
 
 ```bash
 pip install aegis-stack

aegis/__init__.py

@@ -2,4 +2,4 @@
 Aegis Stack CLI - Component generation and project management tools.
 """
 
-__version__ = "0.6.8rc4"
+__version__ = "0.6.8rc5"

aegis/templates/copier-aegis-project/{{ project_slug }}/app/cli/migrate_fix.py.jinja

@@ -121,8 +121,8 @@ def _generate_fix_migration(diffs: list[tuple]) -> Path | None:
 
         if op_type == "add_table":
             table = diff[1]
-            # Build CREATE TABLE with columns
-            cols = []
+            # Build CREATE TABLE with columns + inline FK constraints
+            items = []
             for col in table.columns:
                 col_str = f"sa.Column('{col.name}', {_sa_type_str(col.type)}"
                 col_str += f", nullable={col.nullable}"
@@ -131,23 +131,27 @@ def _generate_fix_migration(diffs: list[tuple]) -> Path | None:
                 if col.server_default is not None:
                     col_str += f", server_default=sa.text('{col.server_default.arg}')"
                 col_str += ")"
-                cols.append(f"        {col_str},")
-            cols_block = "\n".join(cols)
-            upgrade_lines.append(
-                f"    op.create_table(\n        '{table.name}',\n{cols_block}\n    )"
-            )
-            # Add foreign keys
+                items.append(f"        {col_str},")
+            # Inline FK constraints (works with SQLite — created with table)
             for fk in table.foreign_key_constraints:
                 local_cols = [c.name for c in fk.columns]
                 ref_table = fk.referred_table.name
-                ref_cols = [c.name for c in fk.referred_table.primary_key.columns]
-                fk_name = fk.name or f"fk_{table.name}_{'_'.join(local_cols)}_{ref_table}"
-                upgrade_lines.append(
-                    f"    op.create_foreign_key('{fk_name}', '{table.name}', '{ref_table}', {local_cols}, {ref_cols})"
-                )
-                downgrade_lines.append(
-                    f"    op.drop_constraint('{fk_name}', '{table.name}', type_='foreignkey')"
+                ref_cols = [
+                    el.column.name
+                    for el in fk.elements
+                    if hasattr(el, "column") and el.column is not None
+                ]
+                if not ref_cols:
+                    ref_cols = [c.name for c in fk.referred_table.primary_key.columns]
+                ref_col_strs = [f"'{ref_table}.{rc}'" for rc in ref_cols]
+                local_col_strs = [f"'{lc}'" for lc in local_cols]
+                items.append(
+                    f"        sa.ForeignKeyConstraint([{', '.join(local_col_strs)}], [{', '.join(ref_col_strs)}]),"
                 )
+            items_block = "\n".join(items)
+            upgrade_lines.append(
+                f"    op.create_table(\n        '{table.name}',\n{items_block}\n    )"
+            )
             # Add indexes
             for idx in table.indexes:
                 idx_cols = [c.name for c in idx.columns]
@@ -237,6 +241,14 @@ def main() -> None:
     """Check for schema mismatches and generate fix migration."""
     print(t("migrate.checking_schema"))
 
+    # First, apply any pending migrations (e.g., from an aegis upgrade)
+    from alembic import command as alembic_command
+
+    alembic_cfg = Config("alembic/alembic.ini")
+    print(t("migrate.applying_pending"))
+    alembic_command.upgrade(alembic_cfg, "head")
+
+    # Now diff against the updated DB — only truly missing items remain
     diffs = _get_additive_diffs()
 
     if not diffs:

aegis/templates/copier-aegis-project/{{ project_slug }}/app/i18n/locales/en.py

@@ -470,6 +470,7 @@
     ),
     "migrate.no_existing_migrations": "No existing migrations found. Run 'make migrate' first.",
     "migrate.checking_schema": "Checking schema against models...",
+    "migrate.applying_pending": "Applying pending migrations first...",
     "migrate.schema_up_to_date": "Schema is up to date. No fix needed.",
     "migrate.found_differences": "Found {count} schema differences:",
     "migrate.add_column": "ADD COLUMN",

aegis/templates/copier-aegis-project/{{ project_slug }}/app/i18n/locales/zh.py

@@ -469,6 +469,7 @@
     ),
     "migrate.no_existing_migrations": "未找到现有迁移记录，请先运行 'make migrate'。",
     "migrate.checking_schema": "正在检查数据库结构与模型的一致性...",
+    "migrate.applying_pending": "正在先执行待处理的迁移...",
     "migrate.schema_up_to_date": "数据库结构已是最新，无需修复。",
     "migrate.found_differences": "发现 {count} 处结构差异：",
     "migrate.add_column": "新增列",

copier.yml

@@ -6,7 +6,7 @@
 # - Update support
 
 _min_copier_version: "9.0.0"
-_version: "0.6.8rc4"
+_version: "0.6.8rc5"
 
 # IMPORTANT: Template content is in subdirectory
 # This allows the template to be recognized as git-tracked (aegis-stack repo root has .git)

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aegis-stack"
-version = "0.6.8rc4"
+version = "0.6.8rc5"
 description = "A production-ready FastAPI platform with modular components and a built-in control plane. Try: uvx aegis-stack init my-project"
 readme = "README.md"
 requires-python = ">=3.11,<3.15"

tests/core/test_migrate_fix.py

@@ -196,6 +196,65 @@ def test_upgrade_scenario_basic_to_current(self) -> None:
         assert "password_reset_token" in added_table_names
         assert "email_verification_token" in added_table_names
 
+    def test_fk_ref_columns_resolved_in_diff_context(self) -> None:
+        """FK referenced columns are accessible from add_table diffs."""
+        engine = create_engine("sqlite:///:memory:")
+
+        # Create only the user table (referenced by FK)
+        old_metadata = sa.MetaData()
+        sa.Table(
+            "user",
+            old_metadata,
+            sa.Column("id", sa.Integer(), primary_key=True),
+            sa.Column("email", sa.String(), nullable=False),
+        )
+        old_metadata.create_all(engine)
+
+        # New metadata adds a table with FK to user
+        new_metadata = sa.MetaData()
+        sa.Table(
+            "user",
+            new_metadata,
+            sa.Column("id", sa.Integer(), primary_key=True),
+            sa.Column("email", sa.String(), nullable=False),
+        )
+        sa.Table(
+            "password_reset_token",
+            new_metadata,
+            sa.Column("id", sa.Integer(), primary_key=True),
+            sa.Column(
+                "user_id",
+                sa.Integer(),
+                sa.ForeignKey("user.id"),
+                nullable=False,
+            ),
+            sa.Column("token", sa.String(), nullable=False),
+        )
+
+        with engine.connect() as conn:
+            migration_ctx = MigrationContext.configure(conn)
+            diffs = compare_metadata(migration_ctx, new_metadata)
+
+        # Get the add_table diff
+        add_table_diffs = [d for d in diffs if d[0] == "add_table"]
+        assert len(add_table_diffs) == 1
+
+        table = add_table_diffs[0][1]
+        assert table.name == "password_reset_token"
+
+        # Verify FK ref columns are resolvable (the bug was empty ref_cols)
+        fks = list(table.foreign_key_constraints)
+        assert len(fks) == 1
+        fk = fks[0]
+
+        # Try element-based extraction (our fix)
+        ref_cols = [
+            el.column.name
+            for el in fk.elements
+            if hasattr(el, "column") and el.column is not None
+        ]
+        assert ref_cols == ["id"], f"FK ref_cols should be ['id'], got {ref_cols}"
+
 
 class TestMigrateFixMigrationRendering:
     """Test that add_table diffs render correct migration content."""
@@ -210,7 +269,7 @@ def _sa_type_str(col_type: object) -> str:
         upgrade_lines: list[str] = []
         downgrade_lines: list[str] = []
 
-        cols = []
+        items = []
         for col in table.columns:
             col_str = f"sa.Column('{col.name}', {_sa_type_str(col.type)}"
             col_str += f", nullable={col.nullable}"
@@ -219,23 +278,28 @@ def _sa_type_str(col_type: object) -> str:
             if col.server_default is not None:
                 col_str += f", server_default=sa.text('{col.server_default.arg}')"  # type: ignore[union-attr]
             col_str += ")"
-            cols.append(f"        {col_str},")
-        cols_block = "\n".join(cols)
-        upgrade_lines.append(
-            f"    op.create_table(\n        '{table.name}',\n{cols_block}\n    )"
-        )
-
+            items.append(f"        {col_str},")
+        # Inline FK constraints
         for fk in table.foreign_key_constraints:
             local_cols = [c.name for c in fk.columns]
             ref_table = fk.referred_table.name
-            ref_cols = [c.name for c in fk.referred_table.primary_key.columns]
-            fk_name = fk.name or f"fk_{table.name}_{'_'.join(local_cols)}_{ref_table}"
-            upgrade_lines.append(
-                f"    op.create_foreign_key('{fk_name}', '{table.name}', '{ref_table}', {local_cols}, {ref_cols})"
-            )
-            downgrade_lines.append(
-                f"    op.drop_constraint('{fk_name}', '{table.name}', type_='foreignkey')"
+            # Match production: prefer fk.elements, fall back to PK
+            ref_cols = [
+                el.column.name
+                for el in fk.elements
+                if hasattr(el, "column") and el.column is not None
+            ]
+            if not ref_cols:
+                ref_cols = [c.name for c in fk.referred_table.primary_key.columns]
+            ref_col_strs = [f"'{ref_table}.{rc}'" for rc in ref_cols]
+            local_col_strs = [f"'{lc}'" for lc in local_cols]
+            items.append(
+                f"        sa.ForeignKeyConstraint([{', '.join(local_col_strs)}], [{', '.join(ref_col_strs)}]),"
             )
+        items_block = "\n".join(items)
+        upgrade_lines.append(
+            f"    op.create_table(\n        '{table.name}',\n{items_block}\n    )"
+        )
 
         for idx in table.indexes:
             idx_cols = [c.name for c in idx.columns]
@@ -278,8 +342,8 @@ def test_renders_create_table(self) -> None:
         # Downgrade drops the table
         assert "op.drop_table('password_reset_token')" in downgrade[-1]
 
-    def test_renders_foreign_keys(self) -> None:
-        """add_table diff with FKs renders op.create_foreign_key."""
+    def test_renders_foreign_keys_inline(self) -> None:
+        """add_table diff with FKs renders inline sa.ForeignKeyConstraint."""
         metadata = sa.MetaData()
         sa.Table(
             "user",
@@ -302,18 +366,15 @@ def test_renders_foreign_keys(self) -> None:
         token_table = metadata.tables["password_reset_token"]
         upgrade, downgrade = self._render_add_table_upgrade(token_table)
 
-        # Should have create_foreign_key
+        # FK should be inline in create_table, not separate
+        create_line = upgrade[0]
+        assert "ForeignKeyConstraint" in create_line
+        assert "'user_id'" in create_line
+        assert "'user.id'" in create_line
+
+        # No separate create_foreign_key calls
         fk_lines = [line for line in upgrade if "create_foreign_key" in line]
-        assert len(fk_lines) == 1
-        assert "'password_reset_token'" in fk_lines[0]
-        assert "'user'" in fk_lines[0]
-        assert "['user_id']" in fk_lines[0]
-        assert "['id']" in fk_lines[0]
-
-        # Downgrade should drop the constraint
-        drop_fk_lines = [line for line in downgrade if "drop_constraint" in line]
-        assert len(drop_fk_lines) == 1
-        assert "type_='foreignkey'" in drop_fk_lines[0]
+        assert len(fk_lines) == 0
 
     def test_renders_indexes(self) -> None:
         """add_table diff with indexes renders op.create_index."""