SONAR-5007 fix db migration

8 files changed, 9 insertions, 12 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java
index 030d67973dc..ae9eab457df 100644
--- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java
@@ -120,16 +120,12 @@ public class QualityProfileDto extends Dto<String> {
     return rulesUpdatedAt;
   }
 
-  public Date getRulesUpdatedAtAsDate() {
-    return UtcDateUtils.parseDateTime(rulesUpdatedAt);
-  }
-
   public QualityProfileDto setRulesUpdatedAt(String s) {
     this.rulesUpdatedAt = s;
     return this;
   }
 
-  public QualityProfileDto setRulesUpdatedAt(Date d) {
+  public QualityProfileDto setRulesUpdatedAtAsDate(Date d) {
     this.rulesUpdatedAt = UtcDateUtils.formatDateTime(d);
     return this;
   }
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 48669de583b..f2c0c203b09 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
@@ -47,7 +47,7 @@
 
   <update id="updateProfileDates" parameterType="map">
     update rules_profiles
-    set created_at=#{createdAt}, updated_at=#{updatedAt}, rules_updated_at=#{updatedAt}
+    set created_at=#{createdAt}, updated_at=#{updatedAt}, rules_updated_at=#{rulesUpdatedAt}
     where id=#{profileId}
   </update>
 
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java
index 9d563473fbe..a6fa81675e6 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java
@@ -78,7 +78,7 @@ public class QProfileFactory implements ServerComponent {
       QualityProfileDto dto = QualityProfileDto.createFor(key)
         .setName(name.getName())
         .setLanguage(name.getLanguage())
-        .setRulesUpdatedAt(now);
+        .setRulesUpdatedAtAsDate(now);
       if (db.qualityProfileDao().getByKey(dbSession, dto.getKey()) == null) {
         db.qualityProfileDao().insert(dbSession, dto);
         return dto;
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java
index 605e45ae7d2..cf80395fecc 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java
@@ -144,7 +144,7 @@ public class RuleActivator implements ServerComponent {
   }
 
   private void updateProfileDate(DbSession dbSession, RuleActivatorContext context) {
-    context.profile().setRulesUpdatedAt(context.getInitDate());
+    context.profile().setRulesUpdatedAtAsDate(context.getInitDate());
     db.qualityProfileDao().update(dbSession, context.profile());
   }
 
diff --git a/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest.java b/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest.java
index 7eee03656d1..2e61cca0ebd 100644
--- a/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest.java
@@ -25,6 +25,7 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonar.api.utils.DateUtils;
 import org.sonar.api.utils.System2;
+import org.sonar.core.UtcDateUtils;
 import org.sonar.core.persistence.TestDatabase;
 import org.sonar.server.db.DbClient;
 
@@ -42,7 +43,7 @@ public class FeedQProfileDatesMigrationTest {
   public void setUp() throws Exception {
     DbClient dbClient = new DbClient(db.database(), db.myBatis());
     System2 system = mock(System2.class);
-    when(system.now()).thenReturn(DateUtils.parseDate("2014-07-03").getTime());
+    when(system.now()).thenReturn(UtcDateUtils.parseDateTime("2014-07-03T12:00:00+0000").getTime());
     migration = new FeedQProfileDatesMigration(dbClient, system);
   }
 
diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/feed_created_at_and_updated_at_result.xml b/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/feed_created_at_and_updated_at_result.xml
index b8edf93bea9..f9d32493857 100644
--- a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/feed_created_at_and_updated_at_result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/feed_created_at_and_updated_at_result.xml
@@ -2,7 +2,7 @@
 <dataset>
 
   <rules_profiles id="10" name="Sonar Way" language="java" kee="java-sw" parent_kee="[null]"
-                  rules_updated_at="2014-01-24 20:20:05.158" created_at="2011-12-25 20:20:05.158" updated_at="2014-01-24 20:20:05.158"/>
+                  rules_updated_at="2014-01-24T19:20:05+0000" created_at="2011-12-25 20:20:05.158" updated_at="2014-01-24 20:20:05.158"/>
 
   <!-- oldest to newest changes -->
   <active_rule_changes id="122" profile_id="10" profile_version="2" rule_id="1" change_date="2011-12-25 20:20:05.158"
diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/schema.sql b/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/schema.sql
index 36fce32a692..a6237e63fff 100644
--- a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/schema.sql
+++ b/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/schema.sql
@@ -4,7 +4,7 @@ CREATE TABLE "RULES_PROFILES" (
   "LANGUAGE" VARCHAR(20),
   "KEE" VARCHAR(1000) NOT NULL,
   "PARENT_KEE" VARCHAR(1000),
-  "RULES_UPDATED_AT" TIMESTAMP,
+  "RULES_UPDATED_AT" VARCHAR(100),
   "CREATED_AT" TIMESTAMP,
   "UPDATED_AT" TIMESTAMP
 );
diff --git a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/use_default_dates_when_no_changes_result.xml b/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/use_default_dates_when_no_changes_result.xml
index e1cf4eb6efa..21e3251b1ef 100644
--- a/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/use_default_dates_when_no_changes_result.xml
+++ b/sonar-server/src/test/resources/org/sonar/server/db/migrations/v44/FeedQProfileDatesMigrationTest/use_default_dates_when_no_changes_result.xml
@@ -2,7 +2,7 @@
 <dataset>
 
   <rules_profiles id="10" name="Sonar Way" language="java" kee="java-sw" parent_kee="[null]"
-                  rules_updated_at="2014-07-03" created_at="2014-07-03" updated_at="2014-07-03"/>
+                  rules_updated_at="2014-07-03T12:00:00+0000" created_at="2014-07-03 14:00:00.0" updated_at="2014-07-03 14:00:00.0"/>
 
 
   <!-- another profile -->