diff options
| author | Duarte Meneses <duarte.meneses@sonarsource.com> | 2022-06-21 13:32:16 -0500 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2022-06-22 16:09:14 +0000 |
| commit | b2d98671b631e830d563c6b5b63ee2ef06cd9b55 (patch) | |
| tree | b343d78214f0608f2d15db1acc81a609c7383ff6 /server | |
| parent | 308e3b537734beb775c9dff31f67b7cbadba8b08 (diff) | |
| download | sonarqube-b2d98671b631e830d563c6b5b63ee2ef06cd9b55.tar.gz sonarqube-b2d98671b631e830d563c6b5b63ee2ef06cd9b55.zip | |
SONAR-16501 'projectCountBySCM' and 'projectCountByCI' count branches as projects
Diffstat (limited to 'server')
2 files changed, 4 insertions, 1 deletions
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/AnalysisPropertiesMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/AnalysisPropertiesMapper.xml index 685e1ad0a05..846ae7a2338 100644 --- a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/AnalysisPropertiesMapper.xml +++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/AnalysisPropertiesMapper.xml @@ -39,7 +39,7 @@ inner join snapshots s on s.component_uuid = cp.uuid inner join analysis_properties ap on ap.analysis_uuid = s.uuid where - s.islast = ${_true} and ap.kee = #{analysisPropertyKey, jdbcType=VARCHAR} + cp.main_branch_project_uuid is null and s.islast = ${_true} and ap.kee = #{analysisPropertyKey, jdbcType=VARCHAR} group by ap.text_value </select> diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/AnalysisPropertiesDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/AnalysisPropertiesDaoTest.java index 2b74ed3d179..852291698aa 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/AnalysisPropertiesDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/AnalysisPropertiesDaoTest.java @@ -184,7 +184,10 @@ public class AnalysisPropertiesDaoTest { final int index = i; ProjectDto project = dbTester.components().insertPrivateProjectDto(); dbTester.components().insertSnapshot(project, s -> s.setLast(true).setUuid("uuid" + index)); + // branches shouldn't be taken into account + dbTester.components().insertProjectBranch(project); } + underTest.insert(dbSession, new AnalysisPropertyDto().setKey(analysisPropertyKey).setValue("git").setAnalysisUuid("uuid0").setUuid("0")); underTest.insert(dbSession, new AnalysisPropertyDto().setKey(analysisPropertyKey).setValue("svn").setAnalysisUuid("uuid1").setUuid("1")); underTest.insert(dbSession, new AnalysisPropertyDto().setKey(analysisPropertyKey).setValue("undetected").setAnalysisUuid("uuid2").setUuid("2")); |