diff options
author | Julien HENRY <julien.henry@sonarsource.com> | 2018-12-10 19:22:44 +0100 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2019-01-16 09:43:08 +0100 |
commit | 6067a4689902828f7331e2f0a45db02e654a1a06 (patch) | |
tree | cf2813a9bf002fff0a9523734af4c30fe0e0e269 /server/sonar-db-dao | |
parent | eae7151086efcdbcd91945e7cbe28e1a76e186ef (diff) | |
download | sonarqube-6067a4689902828f7331e2f0a45db02e654a1a06.tar.gz sonarqube-6067a4689902828f7331e2f0a45db02e654a1a06.zip |
SONAR-11459 Migrate module and folder issues to the root
Diffstat (limited to 'server/sonar-db-dao')
4 files changed, 15 insertions, 2 deletions
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 fe2f3941ab3..aed5fc1138a 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 @@ -183,7 +183,7 @@ public class ComponentDao implements Dao { return mapper(session).selectUuidsByKeyFromProjectKey(projectKey); } - public List<ComponentDto> selectModulesFromProjectKey(DbSession session, String projectKey, boolean excludeDisabled) { + public List<ComponentDto> selectProjectAndModulesFromProjectKey(DbSession session, String projectKey, boolean excludeDisabled) { return mapper(session).selectComponentsFromProjectKeyAndScope(projectKey, Scopes.PROJECT, excludeDisabled); } @@ -192,7 +192,7 @@ public class ComponentDao implements Dao { } public List<ComponentDto> selectEnabledModulesFromProjectKey(DbSession session, String projectKey) { - return selectModulesFromProjectKey(session, projectKey, true); + return selectProjectAndModulesFromProjectKey(session, projectKey, true); } public List<ComponentDto> selectByKeys(DbSession session, Collection<String> keys) { diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueDao.java index 4d2e46185e9..60da3909145 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueDao.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueDao.java @@ -61,6 +61,10 @@ public class IssueDao implements Dao { return mapper(session).selectComponentUuidsOfOpenIssuesForProjectUuid(projectUuid); } + public Set<String> selectModuleAndDirComponentUuidsOfOpenIssuesForProjectUuid(DbSession session, String projectUuid) { + return mapper(session).selectModuleAndDirComponentUuidsOfOpenIssuesForProjectUuid(projectUuid); + } + public List<IssueDto> selectNonClosedByComponentUuidExcludingExternalsAndSecurityHotspots(DbSession dbSession, String componentUuid) { return mapper(dbSession).selectNonClosedByComponentUuidExcludingExternals(componentUuid); } diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueMapper.java index df441a1b778..e399267440d 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueMapper.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueMapper.java @@ -32,6 +32,8 @@ public interface IssueMapper { Set<String> selectComponentUuidsOfOpenIssuesForProjectUuid(String projectUuid); + Set<String> selectModuleAndDirComponentUuidsOfOpenIssuesForProjectUuid(String projectUuid); + List<IssueDto> selectByKeys(List<String> keys); List<IssueDto> selectByKeysIfNotUpdatedAt(@Param("keys") List<String> keys, @Param("updatedAt") long updatedAt); diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/issue/IssueMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/issue/IssueMapper.xml index 9592c6831ce..cf9958a1e50 100644 --- a/server/sonar-db-dao/src/main/resources/org/sonar/db/issue/IssueMapper.xml +++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/issue/IssueMapper.xml @@ -242,6 +242,13 @@ i.kee, ic.issue_change_creation_date desc </select> + <select id="selectModuleAndDirComponentUuidsOfOpenIssuesForProjectUuid" parameterType="string" resultType="string"> + select distinct(i.component_uuid) + from issues i + inner join projects p on p.uuid=i.component_uuid + where i.project_uuid=#{projectUuid,jdbcType=VARCHAR} and i.status <> 'CLOSED' and (p.qualifier = 'DIR' OR p.qualifier = 'BRC') + </select> + <select id="selectComponentUuidsOfOpenIssuesForProjectUuid" parameterType="string" resultType="string"> select distinct(i.component_uuid) from issues i |