Undo migration to remove redundant channel column (#1071)

conda-incubator · Jan 31, 2025 · c711b03 · c711b03
1 parent 5ff9898
commit c711b03
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 377 deletions.
diff --git a/...tore_server/_internal/alembic/versions/89637f546129_remove_conda_package_build_channel.py b/...tore_server/_internal/alembic/versions/89637f546129_remove_conda_package_build_channel.py
diff --git a/conda-store-server/conda_store_server/_internal/orm.py b/conda-store-server/conda_store_server/_internal/orm.py
@@ -758,6 +758,7 @@ class CondaPackageBuild(Base):
 
     __table_args__ = (
         UniqueConstraint(
+            "channel_id",
             "package_id",
             "subdir",
             "build",
@@ -772,6 +773,14 @@ class CondaPackageBuild(Base):
     package_id: Mapped[int] = mapped_column(ForeignKey("conda_package.id"))
     package: Mapped["CondaPackage"] = relationship(back_populates="builds")
 
+    """
+    Some package builds have the exact same data from different channels.
+    Thus, when adding a channel, populating CondaPackageBuild can encounter
+    duplicate keys errors. That's why we need to distinguish them by channel_id.
+    """
+    channel_id: Mapped[int] = mapped_column(ForeignKey("conda_channel.id"))
+    channel: Mapped["CondaChannel"] = relationship(CondaChannel)
+
     build: Mapped[str] = mapped_column(Unicode(64), index=True)
     build_number: Mapped[int]
     constrains: Mapped[dict] = mapped_column(JSON)

diff --git a/...r/tests/_internal/alembic/version/test_89637f546129_remove_conda_package_build_channel.py b/...r/tests/_internal/alembic/version/test_89637f546129_remove_conda_package_build_channel.py