SONAR-6615 add in table 'manual_measures' column 'compunent_uuid'

8 files changed, 27 insertions, 11 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/custommeasure/db/CustomMeasureDto.java b/sonar-core/src/main/java/org/sonar/core/measure/custom/db/CustomMeasureDto.java
index 20f139252af..26030e3067e 100644
--- a/sonar-core/src/main/java/org/sonar/core/custommeasure/db/CustomMeasureDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/measure/custom/db/CustomMeasureDto.java
@@ -18,12 +18,13 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.custommeasure.db;
+package org.sonar.core.measure.custom.db;
 
 public class CustomMeasureDto {
   private long id;
   private int metricId;
   private long componentId;
+  private String componentUuid;
   private double value;
   private String textValue;
   private String userLogin;
@@ -111,4 +112,13 @@ public class CustomMeasureDto {
     this.createdAt = createdAt;
     return this;
   }
+
+  public String getComponentUuid() {
+    return componentUuid;
+  }
+
+  public CustomMeasureDto setComponentUuid(String componentUuid) {
+    this.componentUuid = componentUuid;
+    return this;
+  }
 }
diff --git a/sonar-core/src/main/java/org/sonar/core/custommeasure/db/CustomMeasureMapper.java b/sonar-core/src/main/java/org/sonar/core/measure/custom/db/CustomMeasureMapper.java
index b2f3d4b9d79..ab0c89beb60 100644
--- a/sonar-core/src/main/java/org/sonar/core/custommeasure/db/CustomMeasureMapper.java
+++ b/sonar-core/src/main/java/org/sonar/core/measure/custom/db/CustomMeasureMapper.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.core.custommeasure.db;
+package org.sonar.core.measure.custom.db;
 
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
diff --git a/sonar-core/src/main/java/org/sonar/core/custommeasure/db/package-info.java b/sonar-core/src/main/java/org/sonar/core/measure/custom/db/package-info.java
index 8a19bbe9399..4635db7f1aa 100644
--- a/sonar-core/src/main/java/org/sonar/core/custommeasure/db/package-info.java
+++ b/sonar-core/src/main/java/org/sonar/core/measure/custom/db/package-info.java
@@ -19,7 +19,7 @@
  */
 
 @ParametersAreNonnullByDefault
-package org.sonar.core.custommeasure.db;
+package org.sonar.core.measure.custom.db;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
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 9eb31a6089b..f7d7ee524ed 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
@@ -34,7 +34,7 @@ import org.sonar.api.server.ServerSide;
 @ServerSide
 public class DatabaseVersion {
 
-  public static final int LAST_VERSION = 917;
+  public static final int LAST_VERSION = 919;
 
   /**
    * List of all the tables.n
diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java b/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java
index 4e79ef0e850..4c00dfa35f9 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java
@@ -53,8 +53,8 @@ import org.sonar.core.component.db.SnapshotMapper;
 import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.core.computation.db.AnalysisReportMapper;
 import org.sonar.core.config.Logback;
-import org.sonar.core.custommeasure.db.CustomMeasureDto;
-import org.sonar.core.custommeasure.db.CustomMeasureMapper;
+import org.sonar.core.measure.custom.db.CustomMeasureDto;
+import org.sonar.core.measure.custom.db.CustomMeasureMapper;
 import org.sonar.core.dashboard.ActiveDashboardDto;
 import org.sonar.core.dashboard.ActiveDashboardMapper;
 import org.sonar.core.dashboard.DashboardDto;
diff --git a/sonar-core/src/main/resources/org/sonar/core/custommeasure/db/CustomMeasureMapper.xml b/sonar-core/src/main/resources/org/sonar/core/measure/custom/db/CustomMeasureMapper.xml
index b796a7ac0bf..a3c935db3dc 100644
--- a/sonar-core/src/main/resources/org/sonar/core/custommeasure/db/CustomMeasureMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/measure/custom/db/CustomMeasureMapper.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="org.sonar.core.custommeasure.db.CustomMeasureMapper">
+<mapper namespace="org.sonar.core.measure.custom.db.CustomMeasureMapper">
   <sql id="selectColumns">
     m.id,
     m.metric_id as metricId,
     m.resource_id as componentId,
+    m.component_uuid as componentUuid,
     m.value,
     m.text_value as textValue,
     m.user_login as userLogin,
@@ -37,12 +38,12 @@
 
   <insert id="insert" parameterType="CustomMeasure" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
     INSERT INTO manual_measures (
-    metric_id, resource_id, value, text_value, user_login, description, created_at, updated_at
+    metric_id, resource_id, component_uuid, value, text_value, user_login, description, created_at, updated_at
     )
     VALUES (
-    #{metricId, jdbcType=INTEGER}, #{componentId, jdbcType=INTEGER}, #{value, jdbcType=DOUBLE},
-    #{textValue, jdbcType=VARCHAR}, #{userLogin, jdbcType=VARCHAR},#{description, jdbcType=VARCHAR},
-    #{createdAt, jdbcType=BIGINT}, #{updatedAt, jdbcType=BIGINT}
+    #{metricId, jdbcType=INTEGER}, #{componentId, jdbcType=INTEGER}, #{componentUuid, jdbcType=VARCHAR},
+    #{value, jdbcType=DOUBLE}, #{textValue, jdbcType=VARCHAR}, #{userLogin, jdbcType=VARCHAR},
+    #{description, jdbcType=VARCHAR}, #{createdAt, jdbcType=BIGINT}, #{updatedAt, jdbcType=BIGINT}
     )
   </insert>
 
diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
index 18b38f9a71d..065ff71ae4c 100644
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
@@ -341,6 +341,8 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('914');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('915');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('916');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('917');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('918');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('919');
 
 INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '1418215735482', '1418215735482', null, null);
 ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2;
diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
index c7974769cc9..3670c426c1f 100644
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
@@ -282,6 +282,7 @@ CREATE TABLE "MANUAL_MEASURES" (
   "ID" BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1),
   "METRIC_ID" INTEGER NOT NULL,
   "RESOURCE_ID" INTEGER,
+  "COMPONENT_UUID" VARCHAR(50),
   "VALUE" DOUBLE,
   "TEXT_VALUE" VARCHAR(4000),
   "USER_LOGIN" VARCHAR(255),
@@ -625,6 +626,8 @@ CREATE INDEX "PROPERTIES_KEY" ON "PROPERTIES" ("PROP_KEY");
 
 CREATE INDEX "MANUAL_MEASURES_RESOURCE_ID" ON "MANUAL_MEASURES" ("RESOURCE_ID");
 
+CREATE INDEX "MANUAL_MEASURES_COMPONENT_UUID" ON "MANUAL_MEASURES" ("COMPONENT_UUID");
+
 CREATE INDEX "PROJECTS_KEE" ON "PROJECTS" ("KEE", "ENABLED");
 
 CREATE INDEX "PROJECTS_ROOT_ID" ON "PROJECTS" ("ROOT_ID");