From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Mon, 28 Aug 2017 15:57:49 +0000 (+0200)
Subject: SONAR-9616 Filter out branches in ComponentDao#selectProjects()
X-Git-Tag: 6.6-RC1~380^2~34
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=96d5f10d52e6e72123c0ff13f44cef23d623b546;p=sonarqube.git

SONAR-9616 Filter out branches in ComponentDao#selectProjects()
---

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDao.java
index b6456c4e12d..5806296250b 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/component/ComponentDao.java
@@ -237,6 +237,8 @@ public class ComponentDao implements Dao {
    * Returns all projects (Scope {@link org.sonar.api.resources.Scopes#PROJECT} and qualifier
    * {@link org.sonar.api.resources.Qualifiers#PROJECT}) which are enabled.
    *
+   * Branches are not returned.
+   *
    * Used by Views.
    */
   public List<ComponentDto> selectProjects(DbSession session) {
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml
index c61e9363f90..6031646c260 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/ComponentMapper.xml
@@ -226,6 +226,7 @@
       p.enabled=${_true}
       AND p.scope='PRJ'
       AND p.qualifier='TRK'
+      AND p.main_branch_project_uuid IS NULL
   </select>
 
   <select id="selectAllRootsByOrganization" resultType="Component">
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 96dedef6184..ea464ee5f5f 100644
--- 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
@@ -637,8 +637,7 @@ public class ComponentDaoTest {
   public void select_projects() {
     OrganizationDto organization = db.organizations().insert();
     ComponentDto provisionedProject = db.components().insertPrivateProject();
-    ComponentDto provisionedView = db.components().insertView(organization, (dto) -> {
-    });
+    ComponentDto provisionedView = db.components().insertView(organization);
     String projectUuid = db.components().insertProjectAndSnapshot(newPrivateProjectDto(organization)).getComponentUuid();
     String disabledProjectUuid = db.components().insertProjectAndSnapshot(newPrivateProjectDto(organization).setEnabled(false)).getComponentUuid();
     String viewUuid = db.components().insertProjectAndSnapshot(ComponentTesting.newView(organization)).getComponentUuid();
@@ -648,6 +647,17 @@ public class ComponentDaoTest {
       .containsOnly(provisionedProject.uuid(), projectUuid);
   }
 
+  @Test
+  public void select_projects_does_not_return_branches() {
+    OrganizationDto organization = db.organizations().insert();
+    ComponentDto project = db.components().insertMainBranch();
+    ComponentDto branch = db.components().insertProjectBranch(project);
+
+    assertThat(underTest.selectProjects(dbSession))
+      .extracting(ComponentDto::uuid)
+      .containsOnly(project.uuid());
+  }
+
   @Test
   public void select_provisioned() {
     OrganizationDto organization = db.organizations().insert();