diff options
3 files changed, 11 insertions, 5 deletions
diff --git a/sonar-db/src/main/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicMapper.java b/sonar-db/src/main/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicMapper.java index 801456402b9..d8e648487e3 100644 --- a/sonar-db/src/main/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicMapper.java @@ -24,6 +24,9 @@ import java.util.List; import org.apache.ibatis.annotations.Param; public interface PermissionTemplateCharacteristicMapper { + + PermissionTemplateCharacteristicDto selectById(@Param("id") long id); + List<PermissionTemplateCharacteristicDto> selectByTemplateIds(@Param("templateIds") List<Long> templateId); PermissionTemplateCharacteristicDto selectByPermissionAndTemplateId(@Param("permission") String permission, @Param("templateId") long templateId); diff --git a/sonar-db/src/main/resources/org/sonar/db/permission/template/PermissionTemplateCharacteristicMapper.xml b/sonar-db/src/main/resources/org/sonar/db/permission/template/PermissionTemplateCharacteristicMapper.xml index 13664b4293e..cd60828514f 100644 --- a/sonar-db/src/main/resources/org/sonar/db/permission/template/PermissionTemplateCharacteristicMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/permission/template/PermissionTemplateCharacteristicMapper.xml @@ -10,6 +10,13 @@ ptc.updated_at as updatedAt </sql> + <select id="selectById" parameterType="long" resultType="PermissionTemplateCharacteristic"> + select + <include refid="columns" /> + from perm_tpl_characteristics ptc + where ptc.id=#{id,jdbcType=BIGINT} + </select> + <select id="selectByTemplateIds" parameterType="long" resultType="PermissionTemplateCharacteristic"> select <include refid="columns" /> diff --git a/sonar-db/src/test/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoTest.java b/sonar-db/src/test/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoTest.java index 996118eac50..16525797c1e 100644 --- a/sonar-db/src/test/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoTest.java @@ -117,7 +117,7 @@ public class PermissionTemplateCharacteristicDaoTest { .setCreatedAt(123_456_789L) .setUpdatedAt(2_000_000_000L)); - PermissionTemplateCharacteristicDto result = selectById(expectedResult.getId()); + PermissionTemplateCharacteristicDto result = dbSession.getMapper(PermissionTemplateCharacteristicMapper.class).selectById(expectedResult.getId()); assertThat(result.getId()).isNotNull(); assertThat(result).isEqualToComparingFieldByField(expectedResult); } @@ -203,8 +203,4 @@ public class PermissionTemplateCharacteristicDaoTest { assertThat(underTest.selectByTemplateIds(dbSession, asList(1L))).hasSize(0); assertThat(underTest.selectByTemplateIds(dbSession, asList(1L, 2L))).hasSize(1); } - - private PermissionTemplateCharacteristicDto selectById(long id) { - return db.getDbClient().permissionTemplateCharacteristicDao().selectByTemplateIds(dbSession, asList(id)).get(0); - } } |