From a4ff5c7c288ab8423f3c9beed33f04b747c50ee3 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 2 Sep 2026 11:31:25 -0400 Subject: [PATCH] Restore v4.6 migration ordering (#23107) --- ..._ipaddress_host_index.py => 0094_ipaddress_host_index.py} | 0 ...lization_triggers.py => 0095_denormalization_triggers.py} | 2 +- ..._protocol_services.py => 0096_multi_protocol_services.py} | 2 +- ...merge_ipaddress_host_index_and_multi_protocol_services.py | 5 +---- .../migrations/0060_consolidate_unique_constraints.py | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-) rename netbox/ipam/migrations/{0096_ipaddress_host_index.py => 0094_ipaddress_host_index.py} (100%) rename netbox/ipam/migrations/{0094_denormalization_triggers.py => 0095_denormalization_triggers.py} (94%) rename netbox/ipam/migrations/{0095_multi_protocol_services.py => 0096_multi_protocol_services.py} (99%) diff --git a/netbox/ipam/migrations/0096_ipaddress_host_index.py b/netbox/ipam/migrations/0094_ipaddress_host_index.py similarity index 100% rename from netbox/ipam/migrations/0096_ipaddress_host_index.py rename to netbox/ipam/migrations/0094_ipaddress_host_index.py diff --git a/netbox/ipam/migrations/0094_denormalization_triggers.py b/netbox/ipam/migrations/0095_denormalization_triggers.py similarity index 94% rename from netbox/ipam/migrations/0094_denormalization_triggers.py rename to netbox/ipam/migrations/0095_denormalization_triggers.py index 1f43088bb..fe867a133 100644 --- a/netbox/ipam/migrations/0094_denormalization_triggers.py +++ b/netbox/ipam/migrations/0095_denormalization_triggers.py @@ -10,7 +10,7 @@ from utilities.migration import InstallDenormalizationTrigger class Migration(migrations.Migration): dependencies = [ - ('ipam', '0093_alter_prefix__region_alter_prefix__site_group'), + ('ipam', '0094_ipaddress_host_index'), # Source tables (dcim_site, dcim_location) must already exist. ('dcim', '0242_ltree_paths'), ] diff --git a/netbox/ipam/migrations/0095_multi_protocol_services.py b/netbox/ipam/migrations/0096_multi_protocol_services.py similarity index 99% rename from netbox/ipam/migrations/0095_multi_protocol_services.py rename to netbox/ipam/migrations/0096_multi_protocol_services.py index b4336276d..257958b5d 100644 --- a/netbox/ipam/migrations/0095_multi_protocol_services.py +++ b/netbox/ipam/migrations/0096_multi_protocol_services.py @@ -49,7 +49,7 @@ def populate_port_mappings(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ("ipam", "0094_denormalization_triggers"), + ("ipam", "0095_denormalization_triggers"), ] operations = [ diff --git a/netbox/ipam/migrations/0097_merge_ipaddress_host_index_and_multi_protocol_services.py b/netbox/ipam/migrations/0097_merge_ipaddress_host_index_and_multi_protocol_services.py index 6c1a9644d..d0d8ed45f 100644 --- a/netbox/ipam/migrations/0097_merge_ipaddress_host_index_and_multi_protocol_services.py +++ b/netbox/ipam/migrations/0097_merge_ipaddress_host_index_and_multi_protocol_services.py @@ -1,13 +1,10 @@ -# Generated by Django 6.0.7 - from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('ipam', '0096_ipaddress_host_index'), - ('ipam', '0095_multi_protocol_services'), + ('ipam', '0096_multi_protocol_services'), ] operations = [ diff --git a/netbox/virtualization/migrations/0060_consolidate_unique_constraints.py b/netbox/virtualization/migrations/0060_consolidate_unique_constraints.py index c19d69c3e..ef2b656b2 100644 --- a/netbox/virtualization/migrations/0060_consolidate_unique_constraints.py +++ b/netbox/virtualization/migrations/0060_consolidate_unique_constraints.py @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ ('dcim', '0245_consolidate_unique_constraints'), ('extras', '0139_alter_customfieldchoiceset_extra_choices'), - ('ipam', '0094_denormalization_triggers'), + ('ipam', '0095_denormalization_triggers'), ('tenancy', '0026_consolidate_unique_constraints'), ('users', '0016_default_ordering_indexes'), ('virtualization', '0059_virtualmachine__config_context_data'),