diff options
| author | Duarte Meneses <duarte.meneses@sonarsource.com> | 2021-10-28 12:07:23 -0500 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2021-11-09 20:03:15 +0000 |
| commit | e8905886d0e77cc080022dff7e0df79e4823e5de (patch) | |
| tree | 899ad2f2961d3de1070605ceb66b8e69ef4aa222 /server/sonar-db-dao | |
| parent | 2dd9ce1a7271e6448e546d21eb59a2ac41127c08 (diff) | |
| download | sonarqube-e8905886d0e77cc080022dff7e0df79e4823e5de.tar.gz sonarqube-e8905886d0e77cc080022dff7e0df79e4823e5de.zip | |
SONAR-15498 Compute manually selected projects in portfolio
Diffstat (limited to 'server/sonar-db-dao')
3 files changed, 11 insertions, 11 deletions
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/portfolio/PortfolioDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/portfolio/PortfolioDto.java index 48195cc50ea..9009ad5ae82 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/portfolio/PortfolioDto.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/portfolio/PortfolioDto.java @@ -33,7 +33,7 @@ public class PortfolioDto { private String name; private String description; private boolean isPrivate = false; - private String branchName; + private String branchKey; private String rootUuid; private String parentUuid; @@ -71,12 +71,12 @@ public class PortfolioDto { } @CheckForNull - public String getBranchName() { - return branchName; + public String getBranchKey() { + return branchKey; } - public void setBranchName(@Nullable String branchName) { - this.branchName = branchName; + public void setBranchKey(@Nullable String branchKey) { + this.branchKey = branchKey; } public String getSelectionMode() { diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/portfolio/PortfolioMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/portfolio/PortfolioMapper.xml index a07f7f293a7..d25f5a4b6a8 100644 --- a/server/sonar-db-dao/src/main/resources/org/sonar/db/portfolio/PortfolioMapper.xml +++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/portfolio/PortfolioMapper.xml @@ -8,7 +8,7 @@ p.name as name, p.description as description, p.private as isPrivate, - p.branch_name as branchName, + p.branch_key as branchKey, p.root_uuid as rootUuid, p.parent_uuid as parentUuid, p.selection_mode as selectionMode, @@ -227,7 +227,7 @@ private, root_uuid, parent_uuid, - branch_name, + branch_key, selection_mode, selection_expression, created_at, @@ -241,7 +241,7 @@ #{isPrivate,jdbcType=BOOLEAN}, #{rootUuid,jdbcType=VARCHAR}, #{parentUuid,jdbcType=VARCHAR}, - #{branchName,jdbcType=VARCHAR}, + #{branchKey,jdbcType=VARCHAR}, #{selectionMode,jdbcType=VARCHAR}, #{selectionExpression,jdbcType=VARCHAR}, #{createdAt,jdbcType=BIGINT}, @@ -432,7 +432,7 @@ selection_mode = #{selectionMode,jdbcType=VARCHAR}, selection_expression = #{selectionExpression,jdbcType=VARCHAR}, parent_uuid = #{parentUuid,jdbcType=VARCHAR}, - branch_name = #{branchName,jdbcType=VARCHAR}, + branch_key = #{branchKey,jdbcType=VARCHAR}, root_uuid = #{rootUuid,jdbcType=VARCHAR}, updated_at = #{updatedAt,jdbcType=BIGINT} where diff --git a/server/sonar-db-dao/src/schema/schema-sq.ddl b/server/sonar-db-dao/src/schema/schema-sq.ddl index f2720a1e7e1..eb874b033a9 100644 --- a/server/sonar-db-dao/src/schema/schema-sq.ddl +++ b/server/sonar-db-dao/src/schema/schema-sq.ddl @@ -199,7 +199,7 @@ CREATE INDEX "CTM_MESSAGE_TYPE" ON "CE_TASK_MESSAGE"("MESSAGE_TYPE"); CREATE TABLE "COMPONENTS"( "UUID" VARCHAR(50) NOT NULL, - "KEE" VARCHAR(400), + "KEE" VARCHAR(1000), "DEPRECATED_KEE" VARCHAR(400), "NAME" VARCHAR(2000), "LONG_NAME" VARCHAR(2000), @@ -602,7 +602,7 @@ CREATE TABLE "PORTFOLIOS"( "SELECTION_EXPRESSION" VARCHAR(4000), "CREATED_AT" BIGINT NOT NULL, "UPDATED_AT" BIGINT NOT NULL, - "BRANCH_NAME" VARCHAR(255) + "BRANCH_KEY" VARCHAR(255) ); ALTER TABLE "PORTFOLIOS" ADD CONSTRAINT "PK_PORTFOLIOS" PRIMARY KEY("UUID"); CREATE UNIQUE INDEX "UNIQ_PORTFOLIOS_KEE" ON "PORTFOLIOS"("KEE"); |