Merge remote-tracking branch 'origin/branch-6.7'

2 files changed, 1 insertions, 7 deletions

diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v60/PopulateAnalysisUuidOnMeasures.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v60/PopulateAnalysisUuidOnMeasures.java
index c7eca704768..d68fd020771 100644
--- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v60/PopulateAnalysisUuidOnMeasures.java
+++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v60/PopulateAnalysisUuidOnMeasures.java
@@ -44,11 +44,6 @@ public class PopulateAnalysisUuidOnMeasures extends DataChange {
     massUpdate.select("select distinct m.snapshot_id as sId, s.root_snapshot_id as rootSid " +
       "from project_measures m " +
       "inner join snapshots s on m.snapshot_id = s.id " +
-      "where m.analysis_uuid is null " +
-      "union " +
-      "select distinct m.snapshot_id as sId, s.root_snapshot_id as rootSid " +
-      "from project_measures m " +
-      "inner join snapshots s on m.snapshot_id=s.id " +
       "where m.analysis_uuid is null"
     );
     massUpdate.update("update project_measures set analysis_uuid=? where snapshot_id = ? and analysis_uuid is null");
diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v60/PopulateAnalysisUuidOnMeasuresTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v60/PopulateAnalysisUuidOnMeasuresTest.java
index 023793635c6..eb274166294 100644
--- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v60/PopulateAnalysisUuidOnMeasuresTest.java
+++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v60/PopulateAnalysisUuidOnMeasuresTest.java
@@ -81,7 +81,7 @@ public class PopulateAnalysisUuidOnMeasuresTest {
     assertThat(rows.get("analysisUuid")).isEqualTo(expectedAnalysisUuid);
   }
 
-  private String insertSnapshot(long id, String uuid, String qualifier, @Nullable Long rootSnapshotId) {
+  private void insertSnapshot(long id, String uuid, String qualifier, @Nullable Long rootSnapshotId) {
     int depth;
     switch (qualifier) {
       case "TRK":
@@ -108,7 +108,6 @@ public class PopulateAnalysisUuidOnMeasuresTest {
       "ROOT_SNAPSHOT_ID", rootSnapshotId != null ? valueOf(rootSnapshotId) : null,
       "QUALIFIER", qualifier,
       "DEPTH", valueOf(depth));
-    return uuid;
   }
 
   private void insertMeasure(long id, long snapshotId) {