From c2f40fbc6511423200ecfa7a756a5ce1f6a3a006 Mon Sep 17 00:00:00 2001 From: Hugo Herter Date: Mon, 11 Dec 2023 16:00:40 +0100 Subject: [PATCH] Fix: Conflict between multiple database migrations Solution: Linearize the migration files --- ..._ccn_metric_view.py => 0021_08602db6c78f_ccn_metric_view.py} | 2 +- ..._vm_costs_view.py => 0022_e682fc8f9506_fix_vm_costs_view.py} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename deployment/migrations/versions/{0020_08602db6c78f_ccn_metric_view.py => 0021_08602db6c78f_ccn_metric_view.py} (98%) rename deployment/migrations/versions/{0021_e682fc8f9506_fix_vm_costs_view.py => 0022_e682fc8f9506_fix_vm_costs_view.py} (100%) diff --git a/deployment/migrations/versions/0020_08602db6c78f_ccn_metric_view.py b/deployment/migrations/versions/0021_08602db6c78f_ccn_metric_view.py similarity index 98% rename from deployment/migrations/versions/0020_08602db6c78f_ccn_metric_view.py rename to deployment/migrations/versions/0021_08602db6c78f_ccn_metric_view.py index cc17b41dd..20283a1ae 100644 --- a/deployment/migrations/versions/0020_08602db6c78f_ccn_metric_view.py +++ b/deployment/migrations/versions/0021_08602db6c78f_ccn_metric_view.py @@ -11,7 +11,7 @@ # revision identifiers, used by Alembic. revision = "08602db6c78f" -down_revision = "3bf484f2cc95" +down_revision = "88a25ae08ebf" branch_labels = None depends_on = None diff --git a/deployment/migrations/versions/0021_e682fc8f9506_fix_vm_costs_view.py b/deployment/migrations/versions/0022_e682fc8f9506_fix_vm_costs_view.py similarity index 100% rename from deployment/migrations/versions/0021_e682fc8f9506_fix_vm_costs_view.py rename to deployment/migrations/versions/0022_e682fc8f9506_fix_vm_costs_view.py