Fix MeasureDao on PostgreSQL and Oracle

3 files changed, 13 insertions, 1 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/measure/db/PastMeasureDto.java b/sonar-core/src/main/java/org/sonar/core/measure/db/PastMeasureDto.java
index cb8618aecdc..ac06c4946e0 100644
--- a/sonar-core/src/main/java/org/sonar/core/measure/db/PastMeasureDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/measure/db/PastMeasureDto.java
@@ -26,12 +26,22 @@ import javax.annotation.Nullable;
 
 public class PastMeasureDto {
 
+  private Long id;
   private Double value;
   private Integer metricId;
   private Integer ruleId;
   private Integer characteristicId;
   private Integer personId;
 
+  public Long getId() {
+    return id;
+  }
+
+  public PastMeasureDto setId(Long id) {
+    this.id = id;
+    return this;
+  }
+
   public double getValue() {
     Objects.requireNonNull(value);
     return value;
diff --git a/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureMapper.xml b/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureMapper.xml
index e92e260144c..8c13c1d2472 100644
--- a/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureMapper.xml
@@ -71,7 +71,7 @@
   </select>
 
   <select id="selectByComponentUuidAndProjectSnapshotIdAndStatusAndMetricIds" parameterType="map" resultType="org.sonar.core.measure.db.PastMeasureDto">
-    SELECT pm.metric_id as metricId, pm.rule_id as ruleId, pm.characteristic_id as characteristicId, pm.person_id as personId, pm.value as value
+    SELECT pm.id as id, pm.metric_id as metricId, pm.rule_id as ruleId, pm.characteristic_id as characteristicId, pm.person_id as personId, pm.value as value
     FROM project_measures pm
     INNER JOIN snapshots s ON s.id=pm.snapshot_id AND s.status=#{status}
     INNER JOIN projects p ON p.id=s.project_id AND p.enabled=${_true}
diff --git a/sonar-core/src/test/java/org/sonar/core/measure/db/PastMeasureDtoTest.java b/sonar-core/src/test/java/org/sonar/core/measure/db/PastMeasureDtoTest.java
index 85a3ada44a6..2baf547ff16 100644
--- a/sonar-core/src/test/java/org/sonar/core/measure/db/PastMeasureDtoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/measure/db/PastMeasureDtoTest.java
@@ -29,12 +29,14 @@ public class PastMeasureDtoTest {
   @Test
   public void test_getter_and_setter() throws Exception {
     PastMeasureDto dto = new PastMeasureDto()
+      .setId(10L)
       .setValue(1d)
       .setMetricId(2)
       .setRuleId(3)
       .setCharacteristicId(4)
       .setPersonId(5);
 
+    assertThat(dto.getId()).isEqualTo(10L);
     assertThat(dto.hasValue()).isTrue();
     assertThat(dto.getValue()).isEqualTo(1d);
     assertThat(dto.getMetricId()).isEqualTo(2);