fix large tests cause by a non standard sql query

3 files changed, 13 insertions, 7 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/computation/db/AnalysisReportDto.java b/sonar-core/src/main/java/org/sonar/core/computation/db/AnalysisReportDto.java
index dd50da26adb..2547c513214 100644
--- a/sonar-core/src/main/java/org/sonar/core/computation/db/AnalysisReportDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/computation/db/AnalysisReportDto.java
@@ -79,6 +79,11 @@ public class AnalysisReportDto extends Dto<String> {
     return id;
   }
 
+  @Override
+  public String toString() {
+    return String.format("analysis report {id:%s;project:'%s'}", getId(), getProjectKey());
+  }
+
   public enum Status {
     PENDING, WORKING
   }
diff --git a/sonar-core/src/main/java/org/sonar/core/computation/db/AnalysisReportMapper.java b/sonar-core/src/main/java/org/sonar/core/computation/db/AnalysisReportMapper.java
index 460cea7d5c7..976f57dda5b 100644
--- a/sonar-core/src/main/java/org/sonar/core/computation/db/AnalysisReportMapper.java
+++ b/sonar-core/src/main/java/org/sonar/core/computation/db/AnalysisReportMapper.java
@@ -43,7 +43,8 @@ public interface AnalysisReportMapper {
 
   int update(AnalysisReportDto report);
 
-  int updateWithBookingReport(@Param("id") Long id, @Param("updatedAt") Date updatedAt, @Param("availableStatus") AnalysisReportDto.Status availableStatus,
+  int updateWithBookingReport(@Param("id") Long id, @Param("projectKey") String projectKey, @Param("updatedAt") Date updatedAt,
+    @Param("availableStatus") AnalysisReportDto.Status availableStatus,
     @Param("busyStatus") AnalysisReportDto.Status busyStatus);
 
   AnalysisReportDto selectById(Long id);
diff --git a/sonar-core/src/main/resources/org/sonar/core/computation/db/AnalysisReportMapper.xml b/sonar-core/src/main/resources/org/sonar/core/computation/db/AnalysisReportMapper.xml
index c5b1e69c81a..eb88a2b4a42 100644
--- a/sonar-core/src/main/resources/org/sonar/core/computation/db/AnalysisReportMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/computation/db/AnalysisReportMapper.xml
@@ -23,15 +23,15 @@
   </update>
 
   <update id="updateWithBookingReport" parameterType="map">
-    update analysis_reports ar1
+    update analysis_reports
     set report_status=#{busyStatus},
     updated_at=#{updatedAt}
-    where ar1.id=#{id} and ar1.report_status=#{availableStatus}
+    where id=#{id} and report_status=#{availableStatus}
     and not exists(
     select 1
-    from analysis_reports ar2
-    where ar1.project_key=ar2.project_key
-    and ar2.report_status=#{busyStatus}
+    from analysis_reports ar
+    where ar.project_key=#{projectKey}
+    and ar.report_status=#{busyStatus}
     )
   </update>
 
@@ -40,7 +40,7 @@
   </delete>
 
   <delete id="delete">
-    delete analysis_reports where id=#{id}
+    delete from analysis_reports where id=#{id}
   </delete>
 
   <select id="selectById" resultType="AnalysisReport">