From df9f136ff0ebffba8e32b98c100da9923deb6f0a Mon Sep 17 00:00:00 2001 From: Jacek Date: Tue, 12 Jan 2021 08:19:30 +0100 Subject: SONAR-14245 Drop 'organization_webhook' index before dropping 'organization_uuid' column in 'webhooks' table --- .../platform/db/migration/version/v87/DropOrganizationInWebhooks.java | 1 + .../db/migration/version/v87/DropOrganizationInWebhooksTest.java | 1 + 2 files changed, 2 insertions(+) diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v87/DropOrganizationInWebhooks.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v87/DropOrganizationInWebhooks.java index 3fdc88af4de..f310d3a9362 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v87/DropOrganizationInWebhooks.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v87/DropOrganizationInWebhooks.java @@ -34,6 +34,7 @@ public class DropOrganizationInWebhooks extends DdlChange { @Override public void execute(Context context) throws SQLException { + context.execute(new DropIndexBuilder(getDialect()).setTable(TABLE_NAME).setName("organization_webhook").build()); context.execute(new DropIndexBuilder(getDialect()).setTable(TABLE_NAME).setName("project_webhook").build()); context.execute(new DropColumnsBuilder(getDialect(), TABLE_NAME, "organization_uuid").build()); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v87/DropOrganizationInWebhooksTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v87/DropOrganizationInWebhooksTest.java index be010b8693c..d5545ae3f51 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v87/DropOrganizationInWebhooksTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v87/DropOrganizationInWebhooksTest.java @@ -34,6 +34,7 @@ public class DropOrganizationInWebhooksTest { @Test public void column_has_been_dropped() throws SQLException { underTest.execute(); + dbTester.assertIndexDoesNotExist("webhooks", "organization_webhook"); dbTester.assertIndexDoesNotExist("webhooks", "project_webhook"); dbTester.assertColumnDoesNotExist("webhooks", "organization_uuid"); } -- cgit v1.2.3