From: Jacek Date: Mon, 20 Apr 2020 08:08:18 +0000 (+0200) Subject: SONAR-13221 change PK to uuid of PROJECT_QPROFILES table X-Git-Tag: 8.4.0.35506~188 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=af3821b8fc2cea8548726a79fc70c0071884a24b;p=sonarqube.git SONAR-13221 change PK to uuid of PROJECT_QPROFILES table --- diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/QualityProfileDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/QualityProfileDao.java index 90f8d985a14..af0525ae5d4 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/QualityProfileDao.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/QualityProfileDao.java @@ -29,6 +29,7 @@ import java.util.Set; import javax.annotation.CheckForNull; import javax.annotation.Nullable; import org.sonar.api.utils.System2; +import org.sonar.core.util.UuidFactory; import org.sonar.core.util.stream.MoreCollectors; import org.sonar.db.Dao; import org.sonar.db.DatabaseUtils; @@ -46,8 +47,10 @@ import static org.sonar.db.DatabaseUtils.executeLargeUpdates; public class QualityProfileDao implements Dao { private final System2 system; + private final UuidFactory uuidFactory; - public QualityProfileDao(System2 system) { + public QualityProfileDao(UuidFactory uuidFactory, System2 system) { + this.uuidFactory = uuidFactory; this.system = system; } @@ -206,7 +209,7 @@ public class QualityProfileDao implements Dao { } public void insertProjectProfileAssociation(DbSession dbSession, ProjectDto project, QProfileDto profile) { - mapper(dbSession).insertProjectProfileAssociation(project.getUuid(), profile.getKee()); + mapper(dbSession).insertProjectProfileAssociation(uuidFactory.create(), project.getUuid(), profile.getKee()); } public void deleteProjectProfileAssociation(DbSession dbSession, ProjectDto project, QProfileDto profile) { diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/QualityProfileMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/QualityProfileMapper.java index 139c77daeb0..7679ac35c02 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/QualityProfileMapper.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/qualityprofile/QualityProfileMapper.java @@ -103,6 +103,7 @@ public interface QualityProfileMapper { @Param("languages") Collection languages); void insertProjectProfileAssociation( + @Param("uuid") String uuid, @Param("projectUuid") String projectUuid, @Param("profileUuid") String profileUuid); diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QualityProfileMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QualityProfileMapper.xml index b27d667f21c..1bd105d38cc 100644 --- a/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QualityProfileMapper.xml +++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/qualityprofile/QualityProfileMapper.xml @@ -300,9 +300,11 @@ insert into project_qprofiles ( + uuid, project_uuid, profile_key ) values ( + #{uuid, jdbcType=VARCHAR}, #{projectUuid, jdbcType=VARCHAR}, #{profileUuid, jdbcType=VARCHAR} ) @@ -334,7 +336,6 @@