diff options
| author | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2014-10-09 19:33:57 +0200 |
|---|---|---|
| committer | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2014-10-09 19:42:04 +0200 |
| commit | 39934181c5a5eba68665ea8922ff9a28322d0c0a (patch) | |
| tree | dec72324495e541a3e329018b9ba6183e73b9c3a /sonar-core | |
| parent | 7238f4b5370b7a08145fc275ebc9900b82c2c4e3 (diff) | |
| download | sonarqube-39934181c5a5eba68665ea8922ff9a28322d0c0a.tar.gz sonarqube-39934181c5a5eba68665ea8922ff9a28322d0c0a.zip | |
fix MySql IT tests caused by MySql limitation regarding Update statement with a sub-query
Diffstat (limited to 'sonar-core')
| -rw-r--r-- | sonar-core/src/main/java/org/sonar/core/computation/db/AnalysisReportMapper.java | 2 | ||||
| -rw-r--r-- | sonar-core/src/main/resources/org/sonar/core/computation/db/AnalysisReportMapper.xml | 6 |
2 files changed, 1 insertions, 7 deletions
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 976f57dda5b..0d817fd7f4d 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,7 @@ public interface AnalysisReportMapper { int update(AnalysisReportDto report); - int updateWithBookingReport(@Param("id") Long id, @Param("projectKey") String projectKey, @Param("updatedAt") Date updatedAt, + int updateWithBookingReport(@Param("id") Long id, @Param("updatedAt") Date updatedAt, @Param("availableStatus") AnalysisReportDto.Status availableStatus, @Param("busyStatus") AnalysisReportDto.Status busyStatus); 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 eb88a2b4a42..b3fdcc0481c 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 @@ -27,12 +27,6 @@ set report_status=#{busyStatus}, updated_at=#{updatedAt} where id=#{id} and report_status=#{availableStatus} - and not exists( - select 1 - from analysis_reports ar - where ar.project_key=#{projectKey} - and ar.report_status=#{busyStatus} - ) </update> <delete id="cleanWithTruncate"> |