Fix mssql CE activity query and incorrect usage of AlwaysIncreasingSystem2 (#2077)

diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeActivityMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeActivityMapper.xml
index 9881bbb28affd7b0015cc0c52bc5f3c10147df95..29cab52cdd6733564ad4c298ce5c2af776076b27 100644 (file)
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeActivityMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/ce/CeActivityMapper.xml
@@ -68,14 +68,14 @@
 
   <select id="selectByQuery" parameterType="map" resultType="org.sonar.db.ce.CeActivityDto" databaseId="mssql">
     select * from (
-    select row_number() over(order by id desc) as number,
+    select row_number() over(order by ca.created_at desc, id desc) as number,
       <include refid="columns"/>,
       <include refid="countWarnings"/>
       <include refid="sqlSelectByQuery" />
       ) as query
     where
       query.number between #{pagination.startRowNumber,jdbcType=INTEGER} and #{pagination.endRowNumber,jdbcType=INTEGER}
-    order by created_at desc, id desc
+    order by createdAt desc, id desc
   </select>
 
   <select id="selectByQuery" parameterType="map" resultType="org.sonar.db.ce.CeActivityDto" databaseId="oracle">

diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java
index 3cb838ff773eea4809e0260ce2711163c0544aa4..c323c4099ad96107740e396a5fe455f23680e680 100644 (file)
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java
@@ -97,7 +97,7 @@ public class ComponentDaoTest {
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
 
-  private System2 system2 = AlwaysIncreasingSystem2.INSTANCE;
+  private System2 system2 = new AlwaysIncreasingSystem2(1000L);
 
   @Rule
   public DbTester db = DbTester.create(system2);
@@ -1199,13 +1199,6 @@ public class ComponentDaoTest {
         project2.uuid(),
         project3.uuid()
       );
-    assertThat(results)
-      .extracting(ComponentDto::getCreatedAt)
-      .containsExactly(
-        firstDate,
-        secondDate,
-        thirdDate
-      );
   }
 
   @Test

diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QualityProfileExportDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QualityProfileExportDaoTest.java
index 7b33fb415261c89afc7f63f8d06541f77021fe15..beed341c565319e2656f38b2739767f0a8bb901e 100644 (file)
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QualityProfileExportDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QualityProfileExportDaoTest.java
@@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class QualityProfileExportDaoTest {
 
   @Rule
-  public DbTester db = DbTester.create(AlwaysIncreasingSystem2.INSTANCE);
+  public DbTester db = DbTester.create(new AlwaysIncreasingSystem2());
 
   private DbSession dbSession = db.getSession();
   private QualityProfileExportDao underTest = db.getDbClient().qualityProfileExportDao();

diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java
index afb7691885bca3401a6bee7bc1367f03aa4a3c08..ee9416ef0f1ce4f15fce76f10b2053aa3ce29b7d 100644 (file)
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java
@@ -71,7 +71,7 @@ import static org.sonar.test.JsonAssert.assertJson;
 
 public class DeactivateActionTest {
 
-  private System2 system2 = AlwaysIncreasingSystem2.INSTANCE;
+  private System2 system2 = new AlwaysIncreasingSystem2();
 
   @Rule
   public ExpectedException expectedException = ExpectedException.none();