Skip to content

Commit 7903ff9

Browse files
danh91claude
andcommitted
fix: resolve migration circular dependency for providers.carrier rename
Revert manager.0039 and manager.0058 to their original dependencies and FK references (providers.carrier). Instead, add manager.0058 as a dependency of providers.0095 to ensure all FK-creating migrations run before the RenameModel, preventing both ValueError and circular deps. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 853df15 commit 7903ff9

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

modules/core/karrio/server/providers/migrations/0095_rename_carrier_to_carrierconnection.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ def get_dependencies():
88
"""Build dependencies list, conditionally including orgs migration."""
99
deps = [
1010
("providers", "0094_remove_carrier_legacy_fields"),
11+
("manager", "0058_manifest_shipment_manifest"),
1112
]
1213
# Only add orgs dependency in multi-org mode (insiders)
1314
# In OSS mode, orgs module doesn't have this migration

modules/manager/karrio/server/manager/migrations/0039_documentuploadrecord.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
1212

1313
dependencies = [
1414
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
15-
('providers', '0095_rename_carrier_to_carrierconnection'),
15+
('providers', '0035_alter_carrier_capabilities'),
1616
('manager', '0038_alter_tracking_status'),
1717
]
1818

@@ -30,7 +30,7 @@ class Migration(migrations.Migration):
3030
('reference', models.CharField(blank=True, max_length=100, null=True)),
3131
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
3232
('shipment', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='shipment_upload_record', to='manager.shipment')),
33-
('upload_carrier', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='providers.carrierconnection')),
33+
('upload_carrier', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='providers.carrier')),
3434
],
3535
options={
3636
'verbose_name': 'Document Upload Record',

modules/manager/karrio/server/manager/migrations/0058_manifest_shipment_manifest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
class Migration(migrations.Migration):
1212

1313
dependencies = [
14-
("providers", "0095_rename_carrier_to_carrierconnection"),
14+
("providers", "0071_alter_tgesettings_my_toll_token"),
1515
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
1616
("manager", "0057_alter_customs_invoice_date"),
1717
]
@@ -98,7 +98,7 @@ class Migration(migrations.Migration):
9898
"manifest_carrier",
9999
models.ForeignKey(
100100
on_delete=django.db.models.deletion.CASCADE,
101-
to="providers.carrierconnection",
101+
to="providers.carrier",
102102
),
103103
),
104104
],

0 commit comments

Comments
 (0)