From: Duarte Meneses <duarte.meneses@sonarsource.com>
Date: Tue, 21 Jun 2022 18:32:16 +0000 (-0500)
Subject: SONAR-16501 'projectCountBySCM' and 'projectCountByCI' count branches as projects
X-Git-Tag: 9.6.0.59041~329
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b2d98671b631e830d563c6b5b63ee2ef06cd9b55;p=sonarqube.git

SONAR-16501 'projectCountBySCM' and 'projectCountByCI' count branches as projects
---

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"));