Zachary Collins 1 year ago
parent
commit
c3807cf0a0
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/sentry/services/hybrid_cloud/replica/impl.py

+ 1 - 1
src/sentry/services/hybrid_cloud/replica/impl.py

@@ -76,7 +76,7 @@ def get_conflicting_unique_columns(
     scope = category.get_scope()
     scope_controlled_columns: List[str]
     if scope == scope.USER_SCOPE:
-        scope_controlled_columns = [get_foreign_key_column(destination, User)]
+        scope_controlled_columns = ["ident", get_foreign_key_column(destination, User)]
     elif scope == scope.ORGANIZATION_SCOPE:
         scope_controlled_columns = list(
             get_foreign_key_columns(destination, Organization, AuthProvider)