"DESCRIPTION" VARCHAR(4000),
"PERSON_ID" INTEGER,
"VARIATION_VALUE_1" DOUBLE,
- "VARIATION_VALUE_2" DOUBLE,
- "VARIATION_VALUE_3" DOUBLE,
- "VARIATION_VALUE_4" DOUBLE,
- "VARIATION_VALUE_5" DOUBLE,
"MEASURE_DATA" BLOB,
"UUID" VARCHAR(40) NOT NULL,
"METRIC_UUID" VARCHAR(40) NOT NULL
"BUILD_DATE" BIGINT,
"PERIOD1_MODE" VARCHAR(100),
"PERIOD1_PARAM" VARCHAR(100),
- "PERIOD2_MODE" VARCHAR(100),
- "PERIOD2_PARAM" VARCHAR(100),
- "PERIOD3_MODE" VARCHAR(100),
- "PERIOD3_PARAM" VARCHAR(100),
- "PERIOD4_MODE" VARCHAR(100),
- "PERIOD4_PARAM" VARCHAR(100),
- "PERIOD5_MODE" VARCHAR(100),
- "PERIOD5_PARAM" VARCHAR(100),
"PERIOD1_DATE" BIGINT,
- "PERIOD2_DATE" BIGINT,
- "PERIOD3_DATE" BIGINT,
- "PERIOD4_DATE" BIGINT,
- "PERIOD5_DATE" BIGINT,
"CREATED_AT" BIGINT
);
ALTER TABLE "SNAPSHOTS" ADD CONSTRAINT "PK_SNAPSHOTS" PRIMARY KEY("UUID");
.add(4000, "Delete 'project_alm_settings' orphans", DeleteProjectAlmSettingsOrphans.class)
.add(4001, "Drop 'period', 'value_warning' columns from 'quality_gates_conditions' table", DropPeriodAndValueWarningColumnsFromQualityGateConditionsTable.class)
.add(4001, "Drop 'project_alm_bindings' table", DropProjectAlmBindings.class)
+ .add(4002, "Drop unused variation values columns in 'project_measures' table", DropUnusedVariationsInProjectMeasures.class)
+ .add(4003, "Drop unused periods in 'snapshots' table", DropUnusedPeriodsInSnapshots.class)
+
;
}
}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2020 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.sonar.server.platform.db.migration.version.v85;
+
+import java.sql.SQLException;
+import org.sonar.db.Database;
+import org.sonar.server.platform.db.migration.sql.DropColumnsBuilder;
+import org.sonar.server.platform.db.migration.step.DdlChange;
+
+public class DropUnusedPeriodsInSnapshots extends DdlChange {
+ private static final String TABLE_NAME = "snapshots";
+
+ public DropUnusedPeriodsInSnapshots(Database db) {
+ super(db);
+ }
+
+ @Override
+ public void execute(Context context) throws SQLException {
+ context.execute(new DropColumnsBuilder(getDialect(), TABLE_NAME, "period2_mode", "period2_param", "period2_date",
+ "period3_mode", "period3_param", "period3_date", "period4_mode", "period4_param", "period4_date", "period5_mode", "period5_param", "period5_date").build());
+ }
+}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2020 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.sonar.server.platform.db.migration.version.v85;
+
+import java.sql.SQLException;
+import org.sonar.db.Database;
+import org.sonar.server.platform.db.migration.sql.DropColumnsBuilder;
+import org.sonar.server.platform.db.migration.step.DdlChange;
+
+public class DropUnusedVariationsInProjectMeasures extends DdlChange {
+ private static final String TABLE_NAME = "project_measures";
+
+ public DropUnusedVariationsInProjectMeasures(Database db) {
+ super(db);
+ }
+
+ @Override
+ public void execute(Context context) throws SQLException {
+ context.execute(new DropColumnsBuilder(getDialect(), TABLE_NAME, "variation_value_2", "variation_value_3", "variation_value_4", "variation_value_5").build());
+ }
+}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2020 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.sonar.server.platform.db.migration.version.v85;
+
+import java.sql.SQLException;
+import java.sql.Types;
+import org.junit.Rule;
+import org.junit.Test;
+import org.sonar.db.CoreDbTester;
+import org.sonar.server.platform.db.migration.step.MigrationStep;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+
+public class DropUnusedPeriodsInSnapshotsTest {
+ private static final String TABLE_NAME = "snapshots";
+
+ @Rule
+ public CoreDbTester db = CoreDbTester.createForSchema(DropUnusedPeriodsInSnapshotsTest.class, "schema.sql");
+
+ private MigrationStep underTest = new DropUnusedPeriodsInSnapshots(db.database());
+
+ @Test
+ public void drops_table() throws SQLException {
+ insertData();
+ db.assertColumnDefinition(TABLE_NAME, "period2_mode", Types.VARCHAR, 100, true);
+ db.assertColumnDefinition(TABLE_NAME, "period3_mode", Types.VARCHAR, 100, true);
+ db.assertColumnDefinition(TABLE_NAME, "period4_mode", Types.VARCHAR, 100, true);
+ db.assertColumnDefinition(TABLE_NAME, "period5_mode", Types.VARCHAR, 100, true);
+
+ db.assertColumnDefinition(TABLE_NAME, "period2_param", Types.VARCHAR, 100, true);
+ db.assertColumnDefinition(TABLE_NAME, "period3_param", Types.VARCHAR, 100, true);
+ db.assertColumnDefinition(TABLE_NAME, "period4_param", Types.VARCHAR, 100, true);
+ db.assertColumnDefinition(TABLE_NAME, "period5_param", Types.VARCHAR, 100, true);
+
+ db.assertColumnDefinition(TABLE_NAME, "period2_date", Types.BIGINT, null, true);
+ db.assertColumnDefinition(TABLE_NAME, "period3_date", Types.BIGINT, null, true);
+ db.assertColumnDefinition(TABLE_NAME, "period4_date", Types.BIGINT, null, true);
+ db.assertColumnDefinition(TABLE_NAME, "period5_date", Types.BIGINT, null, true);
+
+ underTest.execute();
+ db.assertColumnDoesNotExist(TABLE_NAME, "period2_mode");
+ db.assertColumnDoesNotExist(TABLE_NAME, "period3_mode");
+ db.assertColumnDoesNotExist(TABLE_NAME, "period4_mode");
+ db.assertColumnDoesNotExist(TABLE_NAME, "period5_mode");
+
+ db.assertColumnDoesNotExist(TABLE_NAME, "period2_param");
+ db.assertColumnDoesNotExist(TABLE_NAME, "period3_param");
+ db.assertColumnDoesNotExist(TABLE_NAME, "period4_param");
+ db.assertColumnDoesNotExist(TABLE_NAME, "period5_param");
+
+ db.assertColumnDoesNotExist(TABLE_NAME, "period2_date");
+ db.assertColumnDoesNotExist(TABLE_NAME, "period3_date");
+ db.assertColumnDoesNotExist(TABLE_NAME, "period4_date");
+ db.assertColumnDoesNotExist(TABLE_NAME, "period5_date");
+
+ assertThat(db.selectFirst("select * from snapshots")).contains(entry("PERIOD1_MODE", "m1"));
+
+ }
+
+ private void insertData() {
+ db.executeInsert(TABLE_NAME,
+ "uuid", "uuid1",
+ "component_uuid", "component1",
+
+ "period1_mode", "m1",
+ "period2_mode", "m2",
+ "period3_mode", "m3",
+ "period4_mode", "m4",
+ "period5_mode", "m5",
+
+ "period1_param", "p1",
+ "period2_param", "p2",
+ "period3_param", "p3",
+ "period4_param", "p4",
+ "period5_param", "p5",
+
+ "period1_date", 1,
+ "period2_date", 2,
+ "period3_date", 3,
+ "period4_date", 4,
+ "period5_date", 5
+ );
+ }
+}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2020 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.sonar.server.platform.db.migration.version.v85;
+
+import java.sql.SQLException;
+import java.sql.Types;
+import org.junit.Rule;
+import org.junit.Test;
+import org.sonar.db.CoreDbTester;
+import org.sonar.server.platform.db.migration.step.MigrationStep;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+
+public class DropUnusedVariationsInProjectMeasuresTest {
+ private static final String TABLE_NAME = "project_measures";
+
+ @Rule
+ public CoreDbTester db = CoreDbTester.createForSchema(DropUnusedVariationsInProjectMeasuresTest.class, "schema.sql");
+
+ private MigrationStep underTest = new DropUnusedVariationsInProjectMeasures(db.database());
+
+ @Test
+ public void drops_table() throws SQLException {
+ insertData();
+ db.assertColumnDefinition(TABLE_NAME, "variation_value_2", Types.DOUBLE, null, true);
+ db.assertColumnDefinition(TABLE_NAME, "variation_value_3", Types.DOUBLE, null, true);
+ db.assertColumnDefinition(TABLE_NAME, "variation_value_4", Types.DOUBLE, null, true);
+ db.assertColumnDefinition(TABLE_NAME, "variation_value_5", Types.DOUBLE, null, true);
+
+ underTest.execute();
+ db.assertColumnDoesNotExist(TABLE_NAME, "variation_value_2");
+ db.assertColumnDoesNotExist(TABLE_NAME, "variation_value_3");
+ db.assertColumnDoesNotExist(TABLE_NAME, "variation_value_4");
+ db.assertColumnDoesNotExist(TABLE_NAME, "variation_value_5");
+ assertThat(db.selectFirst("select * from project_measures")).contains(entry("VARIATION_VALUE_1", 1.0));
+
+ }
+
+ private void insertData() {
+ db.executeInsert(TABLE_NAME,
+ "uuid", "uuid1",
+ "analysis_uuid", "analysis1",
+ "component_uuid", "component1",
+ "metric_uuid", "metric1",
+ "variation_value_1", 1.0,
+ "variation_value_2", 2.0,
+ "variation_value_3", 3.0,
+ "variation_value_4", 4.0,
+ "variation_value_5", 5.0
+ );
+ }
+}
--- /dev/null
+CREATE TABLE "SNAPSHOTS"(
+ "UUID" VARCHAR(50) NOT NULL,
+ "COMPONENT_UUID" VARCHAR(50) NOT NULL,
+ "STATUS" VARCHAR(4) DEFAULT 'U' NOT NULL,
+ "ISLAST" BOOLEAN DEFAULT FALSE NOT NULL,
+ "VERSION" VARCHAR(500),
+ "PURGE_STATUS" INTEGER,
+ "BUILD_STRING" VARCHAR(100),
+ "REVISION" VARCHAR(100),
+ "BUILD_DATE" BIGINT,
+ "PERIOD1_MODE" VARCHAR(100),
+ "PERIOD1_PARAM" VARCHAR(100),
+ "PERIOD2_MODE" VARCHAR(100),
+ "PERIOD2_PARAM" VARCHAR(100),
+ "PERIOD3_MODE" VARCHAR(100),
+ "PERIOD3_PARAM" VARCHAR(100),
+ "PERIOD4_MODE" VARCHAR(100),
+ "PERIOD4_PARAM" VARCHAR(100),
+ "PERIOD5_MODE" VARCHAR(100),
+ "PERIOD5_PARAM" VARCHAR(100),
+ "PERIOD1_DATE" BIGINT,
+ "PERIOD2_DATE" BIGINT,
+ "PERIOD3_DATE" BIGINT,
+ "PERIOD4_DATE" BIGINT,
+ "PERIOD5_DATE" BIGINT,
+ "CREATED_AT" BIGINT
+);
+ALTER TABLE "SNAPSHOTS" ADD CONSTRAINT "PK_SNAPSHOTS" PRIMARY KEY("UUID");
+CREATE UNIQUE INDEX "ANALYSES_UUID" ON "SNAPSHOTS"("UUID");
+CREATE INDEX "SNAPSHOT_COMPONENT" ON "SNAPSHOTS"("COMPONENT_UUID");
--- /dev/null
+CREATE TABLE "PROJECT_MEASURES"(
+ "VALUE" DOUBLE,
+ "ANALYSIS_UUID" VARCHAR(50) NOT NULL,
+ "COMPONENT_UUID" VARCHAR(50) NOT NULL,
+ "TEXT_VALUE" VARCHAR(4000),
+ "ALERT_STATUS" VARCHAR(5),
+ "ALERT_TEXT" VARCHAR(4000),
+ "DESCRIPTION" VARCHAR(4000),
+ "PERSON_ID" INTEGER,
+ "VARIATION_VALUE_1" DOUBLE,
+ "VARIATION_VALUE_2" DOUBLE,
+ "VARIATION_VALUE_3" DOUBLE,
+ "VARIATION_VALUE_4" DOUBLE,
+ "VARIATION_VALUE_5" DOUBLE,
+ "MEASURE_DATA" BLOB,
+ "UUID" VARCHAR(40) NOT NULL,
+ "METRIC_UUID" VARCHAR(40) NOT NULL
+);
+ALTER TABLE "PROJECT_MEASURES" ADD CONSTRAINT "PK_PROJECT_MEASURES" PRIMARY KEY("UUID");
+CREATE INDEX "MEASURES_COMPONENT_UUID" ON "PROJECT_MEASURES"("COMPONENT_UUID");
+CREATE INDEX "MEASURES_ANALYSIS_METRIC" ON "PROJECT_MEASURES"("ANALYSIS_UUID", "METRIC_UUID");
import org.sonar.core.extension.CoreExtensionRepository;
import org.sonar.core.platform.PluginInfo;
import org.sonar.core.platform.PluginRepository;
-import org.sonar.core.util.UuidFactoryImpl;
import org.sonar.db.DbClient;
import org.sonar.db.DbTester;
-import org.sonar.db.alm.ALM;
import org.sonar.db.component.BranchDto;
import org.sonar.db.component.BranchType;
import org.sonar.db.component.ComponentDbTester;
assertThat(componentId.deprecatedKeySince()).isEqualTo("6.4");
}
- @Test
- public void return_alm_info_on_project() {
- ComponentDto project = insertOrganizationAndProject();
- dbClient.projectAlmBindingsDao().insertOrUpdate(db.getSession(), ALM.BITBUCKETCLOUD, "{123456789}", project.uuid(), null, "http://bitbucket.org/foo/bar");
- db.getSession().commit();
- userSession.addProjectPermission(UserRole.USER, project);
- init();
-
- String json = execute(project.getKey());
-
- assertJson(json).isSimilarTo("{\n" +
- " \"organization\": \"my-org\",\n" +
- " \"key\": \"polop\",\n" +
- " \"id\": \"abcd\",\n" +
- " \"name\": \"Polop\",\n" +
- " \"description\": \"test project\",\n" +
- " \"alm\": {\n" +
- " \"key\": \"bitbucketcloud\",\n" +
- " \"url\": \"http://bitbucket.org/foo/bar\"\n" +
- " }\n" +
- "}\n");
- }
-
@Test(expected = BadRequestException.class)
public void fail_on_module_key_as_param() {
ComponentDto project = insertOrganizationAndProject();
execute(directory.getDbKey());
}
- @Test
- public void return_alm_info_on_branch() {
- ComponentDto project = insertOrganizationAndProject();
- ComponentDto branch = componentDbTester.insertProjectBranch(project, b -> b.setKey("feature1").setUuid("xyz"));
- dbClient.projectAlmBindingsDao().insertOrUpdate(db.getSession(), ALM.BITBUCKETCLOUD, "{123456789}", project.uuid(), null, "http://bitbucket.org/foo/bar");
- db.getSession().commit();
- userSession.addProjectPermission(UserRole.USER, project);
- init();
-
- String json = ws.newRequest()
- .setParam("componentKey", project.getKey())
- .setParam("branch", branch.getBranch())
- .execute()
- .getInput();
-
- assertJson(json).isSimilarTo("{\n" +
- " \"organization\": \"my-org\",\n" +
- " \"key\": \"polop\",\n" +
- " \"id\": \"xyz\",\n" +
- " \"branch\": \"feature1\"," +
- " \"name\": \"Polop\",\n" +
- " \"description\": \"test project\",\n" +
- " \"alm\": {\n" +
- " \"key\": \"bitbucketcloud\",\n" +
- " \"url\": \"http://bitbucket.org/foo/bar\"\n" +
- " }\n" +
- "}\n");
- }
-
private ComponentDto insertOrganizationAndProject() {
OrganizationDto organization = db.organizations().insert(o -> o.setKey("my-org"));
return insertProject(organization);
projects / sonarqube.git / commitdiff