SONAR-11631 Persist sonar.buildString in database

7 files changed, 19 insertions, 0 deletions

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/component/SnapshotDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/component/SnapshotDto.java
index d96035e0bdf..d6c8766fc2e 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/component/SnapshotDto.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/component/SnapshotDto.java
@@ -43,6 +43,7 @@ public final class SnapshotDto {
   private Boolean last;
   private String codePeriodVersion;
   private String projectVersion;
+  private String buildString;
   private String periodMode;
   private String periodParam;
   private Long periodDate;
@@ -147,6 +148,16 @@ public final class SnapshotDto {
     this.projectVersion = projectVersion;
   }
 
+  @CheckForNull
+  public String getBuildString() {
+    return buildString;
+  }
+
+  public SnapshotDto setBuildString(@Nullable String buildString) {
+    this.buildString = buildString;
+    return this;
+  }
+
   public SnapshotDto setPeriodMode(@Nullable String p) {
     periodMode = p;
     return this;
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/SnapshotMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/SnapshotMapper.xml
index 9d2e6043c79..15fd8261549 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/SnapshotMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/SnapshotMapper.xml
@@ -12,6 +12,7 @@
     s.islast as last,
     s.version as rawCodePeriodVersion,
     s.project_version as rawProjectVersion,
+    s.build_string as buildString,
     s.period1_mode as periodMode,
     s.period1_param as periodParam,
     s.period1_date as periodDate
@@ -166,6 +167,7 @@
       islast,
       version,
       project_version,
+      build_string,
       period1_mode,
       period1_param,
       period1_date
@@ -179,6 +181,7 @@
       #{last, jdbcType=BOOLEAN},
       #{codePeriodVersion, jdbcType=VARCHAR},
       #{projectVersion, jdbcType=VARCHAR},
+      #{buildString, jdbcType=VARCHAR},
       #{periodMode, jdbcType=VARCHAR},
       #{periodParam, jdbcType=VARCHAR},
       #{periodDate, jdbcType=BIGINT}
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldPurgeAnalysis-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldPurgeAnalysis-result.xml
index e7651e44899..e9e512f02d2 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldPurgeAnalysis-result.xml
+++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeCommandsTest/shouldPurgeAnalysis-result.xml
@@ -33,6 +33,7 @@ Note that measures, events and reviews are not deleted.
              build_date="1228222680000"
              version="[null]"
              project_version="[null]"
+             build_string="[null]"
   />
   <analysis_properties uuid="u1"
                        snapshot_uuid="u1"
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAbortedBuilds-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAbortedBuilds-result.xml
index 3d926d2b8ed..c70adbbf836 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAbortedBuilds-result.xml
+++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAbortedBuilds-result.xml
@@ -51,6 +51,7 @@ Snapshot 2 has been deleted
              build_date="1228222680000"
              version="[null]"
              project_version="[null]"
+             build_string="[null]"
   />
 
   <!-- snapshot with status "processed" and flagged as "last" -> do not purge and do not delete -->
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAnalyses-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAnalyses-result.xml
index bc8a1e2382e..16a0bab013e 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAnalyses-result.xml
+++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteAnalyses-result.xml
@@ -26,6 +26,7 @@
              build_date="1228222680000"
              version="[null]"
              project_version="[null]"
+             build_string="[null]"
   />
 
   <!-- delete only resource 1 -->
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml
index 259be92616c..39fe34d21c7 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml
+++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldDeleteHistoricalDataOfDirectoriesAndFiles-result.xml
@@ -186,6 +186,7 @@
              build_date="1228222680000"
              version="[null]"
              project_version="[null]"
+             build_string="[null]"
   />
 
   <project_measures id="1"
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject-result.xml
index d58479413b8..7f10558d0a9 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject-result.xml
+++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/purge/PurgeDaoTest/shouldPurgeProject-result.xml
@@ -67,6 +67,7 @@
              build_date="1228222680000"
              version="[null]"
              project_version="[null]"
+             build_string="[null]"
   />