Rename link tables

alembic/versions/2025_11_18_1907-b8a68f4260a4_rename_link_tables.py

@@ -0,0 +1,35 @@
+"""Rename link tables
+
+Revision ID: b8a68f4260a4
+Revises: 783268bd3daa
+Create Date: 2025-11-18 19:07:48.518828
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'b8a68f4260a4'
+down_revision: Union[str, None] = '783268bd3daa'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    old_name_new_name = {
+        "link_task_urls": "link_tasks__urls",
+        "link_agencies_locations": "link_agencies__locations",
+        "link_agency_batches": "link_agencies__batches",
+        "link_batch_urls": "link_batches__urls",
+        "link_location_batches": "link_batches__locations",
+        "link_urls_agency": "link_agencies__urls",
+    }
+    for old_name, new_name in old_name_new_name.items():
+        op.rename_table(old_name, new_name)
+
+
+def downgrade() -> None:
+    pass

src/db/models/impl/agency/sqlalchemy.py

@@ -35,5 +35,5 @@ class Agency(
         "LocationExpandedView",
         primaryjoin="Agency.id == LinkAgencyLocation.agency_id",
         secondaryjoin="LocationExpandedView.id == LinkAgencyLocation.location_id",
-        secondary="link_agencies_locations",
+        secondary="link_agencies__locations",
     )

src/db/models/impl/batch/sqlalchemy.py

@@ -41,7 +41,7 @@ class Batch(WithIDBase):
     # Relationships
     urls = relationship(
         "URL",
-        secondary="link_batch_urls",
+        secondary="link_batches__urls",
         back_populates="batch",
         overlaps="url"
     )

src/db/models/impl/link/agency_batch/sqlalchemy.py

@@ -10,7 +10,7 @@ class LinkAgencyBatch(
     BatchDependentMixin,
     AgencyDependentMixin,
 ):
-    __tablename__ = "link_agency_batches"
+    __tablename__ = "link_agencies__batches"
     __table_args__ = (
         PrimaryKeyConstraint(
             'batch_id',

src/db/models/impl/link/agency_location/sqlalchemy.py

@@ -7,4 +7,4 @@
     AgencyDependentMixin,
     LocationDependentMixin,
 ):
-    __tablename__ = "link_agencies_locations"
+    __tablename__ = "link_agencies__locations"

src/db/models/impl/link/batch_url/sqlalchemy.py

@@ -11,5 +11,5 @@ class LinkBatchURL(
     BatchDependentMixin,
     WithIDBase
 ):
-    __tablename__ = "link_batch_urls"
+    __tablename__ = "link_batches__urls"
 

src/db/models/impl/link/location_batch/sqlalchemy.py

@@ -11,7 +11,7 @@ class LinkLocationBatch(
     CreatedAtMixin
 ):
 
-    __tablename__ = "link_location_batches"
+    __tablename__ = "link_batches__locations"
     __table_args__ = (
         PrimaryKeyConstraint(
             'batch_id',

src/db/models/impl/link/task_url.py

@@ -4,7 +4,7 @@
 
 
 class LinkTaskURL(Base):
-    __tablename__ = 'link_task_urls'
+    __tablename__ = 'link_tasks__urls'
     __table_args__ = (UniqueConstraint(
         "task_id",
         "url_id",

src/db/models/impl/link/url_agency/sqlalchemy.py

@@ -7,7 +7,7 @@
 
 
 class LinkURLAgency(URLDependentMixin, WithIDBase):
-    __tablename__ = "link_urls_agency"
+    __tablename__ = "link_agencies__urls"
 
     agency_id: Mapped[int] = get_agency_id_foreign_column()
 

src/db/models/impl/task/core.py

@@ -32,7 +32,7 @@ class Task(UpdatedAtMixin, WithIDBase):
     # Relationships
     urls = relationship(
         "URL",
-        secondary="link_task_urls",
+        secondary="link_tasks__urls",
         back_populates="tasks"
     )
     errors = relationship(TaskError)

src/db/models/impl/url/core/sqlalchemy.py

@@ -66,7 +66,7 @@ def full_url(cls):
     # Relationships
     batch = relationship(
         "Batch",
-        secondary="link_batch_urls",
+        secondary="link_batches__urls",
         back_populates="urls",
         uselist=False,
     )
@@ -82,7 +82,7 @@ def full_url(cls):
     )
     tasks = relationship(
         "Task",
-        secondary="link_task_urls",
+        secondary="link_tasks__urls",
         back_populates="urls",
     )
     auto_agency_subtasks = relationship(
@@ -110,7 +110,7 @@ def full_url(cls):
         "URLOptionalDataSourceMetadata", uselist=False, back_populates="url")
     confirmed_agencies = relationship(
         "Agency",
-        secondary="link_urls_agency"
+        secondary="link_agencies__urls"
 
     )
     data_source = relationship(

src/db/models/views/batch_url_status/core.py

@@ -11,7 +11,7 @@
                 select
                     1
                 from
-                    link_batch_urls lbu
+                    link_batches__urls lbu
                 where
                     lbu.batch_id = b.id
                 )
@@ -26,7 +26,7 @@
                 select
                     1
                 from
-                    link_batch_urls lbu
+                    link_batches__urls lbu
                 left join flag_url_validated fuv on fuv.url_id = lbu.url_id
                 where
                     lbu.batch_id = b.id
@@ -36,7 +36,7 @@
                 select
                     1
                 from
-                    link_batch_urls lbu
+                    link_batches__urls lbu
                 left join flag_url_validated fuv on fuv.url_id = lbu.url_id
                 where
                     lbu.batch_id = b.id

src/db/models/views/url_annotations_flags.py

@@ -18,7 +18,7 @@
          LEFT JOIN public.user_relevant_suggestions urs ON u.id = urs.url_id
          LEFT JOIN public.user_url_agency_suggestions uuas ON u.id = uuas.url_id
          LEFT JOIN public.reviewing_user_url ruu ON u.id = ruu.url_id
-         LEFT JOIN public.link_urls_agency cua on u.id = cua.url_id
+         LEFT JOIN public.link_agencies__urls cua on u.id = cua.url_id
     )
 """