fix: Remove foreign keys and Add relationship

lablup · Nov 13, 2024 · c1c349c · c1c349c
1 parent 520adaf
commit c1c349c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/...kend/manager/models/alembic/versions/8f85e9d0bd4e_add_association_containerregistries_.py b/...kend/manager/models/alembic/versions/8f85e9d0bd4e_add_association_containerregistries_.py
@@ -25,13 +25,11 @@ def upgrade() -> None:
         sa.Column(
             "registry_id",
             GUID,
-            sa.ForeignKey("container_registries.id", onupdate="CASCADE", ondelete="CASCADE"),
             nullable=False,
         ),
         sa.Column(
             "group_id",
             GUID,
-            sa.ForeignKey("groups.id", onupdate="CASCADE", ondelete="CASCADE"),
             nullable=False,
         ),
     )

diff --git a/src/ai/backend/manager/models/association_container_registries_groups.py b/src/ai/backend/manager/models/association_container_registries_groups.py
@@ -4,6 +4,7 @@
 from typing import Sequence
 
 import sqlalchemy as sa
+from sqlalchemy.orm import relationship
 
 from ai.backend.logging import BraceStyleAdapter
 
@@ -20,12 +21,22 @@ class AssociationContainerRegistriesGroupsRow(Base):
     registry_id = sa.Column(
         "registry_id",
         GUID,
-        sa.ForeignKey("container_registries.id", onupdate="CASCADE", ondelete="CASCADE"),
         nullable=False,
     )
     group_id = sa.Column(
         "group_id",
         GUID,
-        sa.ForeignKey("groups.id", onupdate="CASCADE", ondelete="CASCADE"),
         nullable=False,
     )
+
+    container_registry_row = relationship(
+        "ContainerRegistryRow",
+        back_populates="association_container_registries_groups_rows",
+        primaryjoin="ContainerRegistryRow.id == foreign(AssociationContainerRegistriesGroupsRow.registry_id)",
+    )
+
+    group_row = relationship(
+        "GroupRow",
+        back_populates="association_container_registries_groups_rows",
+        primaryjoin="GroupRow.id == foreign(AssociationContainerRegistriesGroupsRow.group_id)",
+    )