hansjone/netx
1
0
Fork 0
mirror of https://github.com/hansjone/netx.git synced 2026-10-08 23:33:21 +08:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions 2

Ensure topo_folder.external_ref exists on API startup.

Browse source 
Alembic stamp-without-upgrade left brownfield DBs missing the column; always apply a small topology schema safety net before bootstrap.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-08-07 10:09:02 +08:00
parent 961d523479
commit 74672b733f
2 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
netx_api/app_startup.py
View file

@ -10,6 +10,7 @@ from .db import Base, SessionLocal, engine
from .schema_patches import (
apply_all_legacy_startup_ddl,
apply_auth_schema_patches,
apply_topology_schema_safety_net,
run_alembic_upgrade_to_head,
)
from .security_bootstrap import assert_secure_defaults_or_exit
@ -54,8 +55,11 @@ def run_api_startup() -> None:
try:
with engine.begin() as conn:
apply_auth_schema_patches(conn)
# Critical topology columns even when full legacy DDL is skipped
# (e.g. alembic stamped head without applying domain patches).
apply_topology_schema_safety_net(conn)
except Exception:
_log.exception("startup: auth schema patches failed")
_log.exception("startup: auth/topology schema safety patches failed")
if skip_ddl and alembic_ok:
_log.info("startup: schema via Alembic (legacy inline DDL skipped)")
else:

22
netx_api/schema_patches.py
View file

@ -123,6 +123,28 @@ def apply_auth_schema_patches(conn: Connection) -> None:
)
def apply_topology_schema_safety_net(conn: Connection) -> None:
"""Always-on topology columns (Alembic stamp-without-upgrade must not skip these)."""
_run_sql(
conn,
"ALTER TABLE topo_folder ADD COLUMN IF NOT EXISTS external_ref VARCHAR(128) DEFAULT ''",
)
_run_sql(
conn,
"CREATE INDEX IF NOT EXISTS ix_topo_folder_external_ref ON topo_folder (external_ref)",
)
_run_sql(conn, "ALTER TABLE topo_fabric_node ADD COLUMN IF NOT EXISTS world_x DOUBLE PRECISION")
_run_sql(conn, "ALTER TABLE topo_fabric_node ADD COLUMN IF NOT EXISTS world_y DOUBLE PRECISION")
_run_sql(
conn,
"CREATE INDEX IF NOT EXISTS ix_topo_fabric_node_world_x ON topo_fabric_node (world_x)",
)
_run_sql(
conn,
"CREATE INDEX IF NOT EXISTS ix_topo_fabric_node_world_y ON topo_fabric_node (world_y)",
)
def apply_key_alert_schema_patches(
engine: Engine | None = None,
*,