make a separate table

Author: lynnagara

migrations_lockfile.txt

@@ -31,7 +31,7 @@ replays: 0007_organizationmember_replay_access
 
 seer: 0006_add_night_shift_models
 
-sentry: 1068_add_avatar_to_organizationmapping
+sentry: 1068_add_organization_avatar_replica
 
 social_auth: 0003_social_auth_json_field
 

src/sentry/migrations/1068_add_avatar_to_organizationmapping.py

@@ -0,0 +1,64 @@
+# Generated by Django 5.2.12 on 2026-04-15 23:47
+
+import sentry.db.models.fields.bounded
+import sentry.db.models.fields.hybrid_cloud_foreign_key
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = False
+
+    dependencies = [
+        ("sentry", "1067_add_dashboard_revision_model"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="OrganizationAvatarReplica",
+            fields=[
+                (
+                    "id",
+                    sentry.db.models.fields.bounded.BoundedBigAutoField(
+                        primary_key=True, serialize=False
+                    ),
+                ),
+                (
+                    "organization_avatar_id",
+                    sentry.db.models.fields.hybrid_cloud_foreign_key.HybridCloudForeignKey(
+                        "sentry.OrganizationAvatar",
+                        db_index=True,
+                        on_delete="CASCADE",
+                        unique=True,
+                    ),
+                ),
+                (
+                    "organization_id",
+                    sentry.db.models.fields.hybrid_cloud_foreign_key.HybridCloudForeignKey(
+                        "sentry.Organization",
+                        db_index=True,
+                        on_delete="CASCADE",
+                        unique=True,
+                    ),
+                ),
+                ("avatar_type", models.PositiveSmallIntegerField(default=0)),
+                ("avatar_ident", models.CharField(max_length=32)),
+            ],
+            options={
+                "db_table": "sentry_organizationavatareplica",
+            },
+        ),
+    ]

src/sentry/migrations/1068_add_organization_avatar_replica.py

@@ -70,6 +70,7 @@
 from .options import *  # NOQA
 from .organization import *  # NOQA
 from .organizationaccessrequest import *  # NOQA
+from .organizationavatareplica import *  # NOQA
 from .organizationcontributors import *  # NOQA
 from .organizationmapping import *  # NOQA
 from .organizationmember import *  # NOQA

src/sentry/models/__init__.py

@@ -0,0 +1,25 @@
+from __future__ import annotations
+
+from django.db import models
+
+from sentry.backup.scopes import RelocationScope
+from sentry.db.models import Model, control_silo_model, sane_repr
+from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
+
+
+@control_silo_model
+class OrganizationAvatarReplica(Model):
+    __relocation_scope__ = RelocationScope.Excluded
+
+    organization_avatar_id = HybridCloudForeignKey(
+        "sentry.OrganizationAvatar", on_delete="CASCADE", unique=True
+    )
+    organization_id = HybridCloudForeignKey("sentry.Organization", on_delete="CASCADE", unique=True)
+    avatar_type = models.PositiveSmallIntegerField(default=0)
+    avatar_ident = models.CharField(max_length=32)
+
+    class Meta:
+        app_label = "sentry"
+        db_table = "sentry_organizationavatareplica"
+
+    __repr__ = sane_repr("organization_id", "avatar_type")

src/sentry/models/organizationavatareplica.py

@@ -56,10 +56,6 @@ class OrganizationMapping(Model):
     prevent_superuser_access = models.BooleanField(default=False, db_default=False)
     disable_member_invite = models.BooleanField(default=False, db_default=False)
 
-    # Replicated from OrganizationAvatar in the cell silo
-    avatar_type = models.PositiveSmallIntegerField(default=0, db_default=0)
-    avatar_ident = models.CharField(max_length=32, null=True, db_default=None)
-
     date_updated = models.DateTimeField(db_default=Now(), auto_now=True)
 
     class Meta: