From add64436be2fc275aa2578dc6a4eeab427b41208 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Mon, 15 Sep 2014 15:54:45 +0200 Subject: SONAR-5580 Migration issue to SQ 4.4 when the quality profile used to analyze the last version of a project has been removed before the migration --- .../java/org/sonar/core/persistence/DatabaseVersion.java | 2 +- .../core/persistence/migration/v44/Migration44Mapper.java | 4 ++++ .../core/persistence/migration/v44/Migration44Mapper.xml | 12 ++++++++++++ .../main/resources/org/sonar/core/persistence/rows-h2.sql | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) (limited to 'sonar-core') diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java index ee7e376fa52..105c8c5b58f 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java +++ b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java @@ -33,7 +33,7 @@ import java.util.List; */ public class DatabaseVersion implements BatchComponent, ServerComponent { - public static final int LAST_VERSION = 583; + public static final int LAST_VERSION = 584; public static enum Status { UP_TO_DATE, REQUIRES_UPGRADE, REQUIRES_DOWNGRADE, FRESH_INSTALL diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v44/Migration44Mapper.java b/sonar-core/src/main/java/org/sonar/core/persistence/migration/v44/Migration44Mapper.java index 19075d6e9db..8bffe19dd17 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/migration/v44/Migration44Mapper.java +++ b/sonar-core/src/main/java/org/sonar/core/persistence/migration/v44/Migration44Mapper.java @@ -40,6 +40,8 @@ public interface Migration44Mapper { void updateProfileMeasure(@Param("measureId") long measureId, @Param("json") String json); + void deleteProfileMeasure(long profileMeasureId); + @CheckForNull QProfileDto44 selectProfileById(int id); @@ -56,4 +58,6 @@ public interface Migration44Mapper { // migrate changeLog to Activities List selectActiveRuleChange(@Nullable @Param("enabled") Boolean enabled); + + List selectMeasuresOnDeletedQualityProfiles(); } diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/migration/v44/Migration44Mapper.xml b/sonar-core/src/main/resources/org/sonar/core/persistence/migration/v44/Migration44Mapper.xml index f2c0c203b09..eeb24110187 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/migration/v44/Migration44Mapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/persistence/migration/v44/Migration44Mapper.xml @@ -35,6 +35,18 @@ where id=#{measureId} + + delete from project_measures where id=#{id} + + + +