aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-db
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2016-03-24 18:03:34 +0100
committerTeryk Bellahsene <teryk.bellahsene@sonarsource.com>2016-03-29 19:12:01 +0200
commitc6534874a02f9a54caf765ca050f07b404762abb (patch)
treeab46b9d4f9a1e4a9e3b1d7594c4035566a1834af /sonar-db
parente2e23d7aefd4b8a0938412327f2d9f57c3389cda (diff)
downloadsonarqube-c6534874a02f9a54caf765ca050f07b404762abb.tar.gz
sonarqube-c6534874a02f9a54caf765ca050f07b404762abb.zip
SONAR-7470 Delete manual rules from DB
Diffstat (limited to 'sonar-db')
-rw-r--r--sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java2
-rw-r--r--sonar-db/src/main/java/org/sonar/db/version/MigrationStepModule.java4
-rw-r--r--sonar-db/src/main/java/org/sonar/db/version/v55/DeleteManualRules.java54
-rw-r--r--sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql1
-rw-r--r--sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java2
-rw-r--r--sonar-db/src/test/java/org/sonar/db/version/v55/DeleteManualRulesTest.java50
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/version/v55/DeleteManualRulesTest/before.xml24
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/version/v55/DeleteManualRulesTest/schema.sql31
8 files changed, 165 insertions, 3 deletions
diff --git a/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java b/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java
index fd8d63f7bc0..4b0508ef27f 100644
--- a/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java
@@ -29,7 +29,7 @@ import org.sonar.db.MyBatis;
public class DatabaseVersion {
- public static final int LAST_VERSION = 1123;
+ public static final int LAST_VERSION = 1124;
/**
* The minimum supported version which can be upgraded. Lower
diff --git a/sonar-db/src/main/java/org/sonar/db/version/MigrationStepModule.java b/sonar-db/src/main/java/org/sonar/db/version/MigrationStepModule.java
index 7877908e6fd..2ba4db579a7 100644
--- a/sonar-db/src/main/java/org/sonar/db/version/MigrationStepModule.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/MigrationStepModule.java
@@ -73,6 +73,7 @@ import org.sonar.db.version.v55.AddActiveRulesLongDateColumns;
import org.sonar.db.version.v55.AddIssuesType;
import org.sonar.db.version.v55.AddRulesColumns;
import org.sonar.db.version.v55.DeleteManualIssues;
+import org.sonar.db.version.v55.DeleteManualRules;
import org.sonar.db.version.v55.DeleteMeasuresWithCharacteristicId;
import org.sonar.db.version.v55.DeleteMeasuresWithRuleId;
import org.sonar.db.version.v55.DropActiveRulesDateColumns;
@@ -159,7 +160,8 @@ public class MigrationStepModule extends Module {
DropActiveRulesDateColumns.class,
FeedRulesTypes.class,
DeleteMeasuresWithRuleId.class,
- DeleteManualIssues.class
+ DeleteManualIssues.class,
+ DeleteManualRules.class
);
}
}
diff --git a/sonar-db/src/main/java/org/sonar/db/version/v55/DeleteManualRules.java b/sonar-db/src/main/java/org/sonar/db/version/v55/DeleteManualRules.java
new file mode 100644
index 00000000000..43e9175d6e3
--- /dev/null
+++ b/sonar-db/src/main/java/org/sonar/db/version/v55/DeleteManualRules.java
@@ -0,0 +1,54 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact 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.db.version.v55;
+
+import java.sql.SQLException;
+import org.sonar.db.Database;
+import org.sonar.db.version.BaseDataChange;
+import org.sonar.db.version.MassUpdate;
+import org.sonar.db.version.Select;
+import org.sonar.db.version.SqlStatement;
+
+public class DeleteManualRules extends BaseDataChange {
+
+ public DeleteManualRules(Database db) {
+ super(db);
+ }
+
+ @Override
+ public void execute(Context context) throws SQLException {
+ MassUpdate massUpdate = context.prepareMassUpdate();
+ massUpdate.select("SELECT id FROM rules WHERE plugin_name='manual'");
+ massUpdate.update("DELETE FROM rules WHERE id=?");
+ massUpdate.rowPluralName("manual rules");
+ massUpdate.execute(new MigrationHandler());
+ }
+
+ private static class MigrationHandler implements MassUpdate.Handler {
+
+ @Override
+ public boolean handle(Select.Row row, SqlStatement update) throws SQLException {
+ Long id = row.getNullableLong(1);
+ update.setLong(1, id);
+ return true;
+ }
+ }
+
+}
diff --git a/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql b/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
index 511020c42c7..9b36923ad6c 100644
--- a/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
+++ b/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
@@ -401,6 +401,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1120');
INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1121');
INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1122');
INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1123');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1124');
INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, EXTERNAL_IDENTITY, EXTERNAL_IDENTITY_PROVIDER, USER_LOCAL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', 'admin', 'sonarqube', true, 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '1418215735482', '1418215735482', null, null);
ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2;
diff --git a/sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java b/sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java
index daaef18b788..20c4b0d3537 100644
--- a/sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java
@@ -29,6 +29,6 @@ public class MigrationStepModuleTest {
public void verify_count_of_added_MigrationStep_types() {
ComponentContainer container = new ComponentContainer();
new MigrationStepModule().configure(container);
- assertThat(container.size()).isEqualTo(63);
+ assertThat(container.size()).isEqualTo(64);
}
}
diff --git a/sonar-db/src/test/java/org/sonar/db/version/v55/DeleteManualRulesTest.java b/sonar-db/src/test/java/org/sonar/db/version/v55/DeleteManualRulesTest.java
new file mode 100644
index 00000000000..ab9b2e9a654
--- /dev/null
+++ b/sonar-db/src/test/java/org/sonar/db/version/v55/DeleteManualRulesTest.java
@@ -0,0 +1,50 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact 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.db.version.v55;
+
+import java.util.List;
+import java.util.Map;
+import org.junit.Rule;
+import org.junit.Test;
+import org.sonar.api.utils.System2;
+import org.sonar.db.DbTester;
+import org.sonar.db.version.MigrationStep;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class DeleteManualRulesTest {
+
+ @Rule
+ public DbTester db = DbTester.createForSchema(System2.INSTANCE, DeleteManualRulesTest.class, "schema.sql");
+
+ private MigrationStep migration = new DeleteManualRules(db.database());;
+
+ @Test
+ public void delete_manual_issues() throws Exception {
+ db.prepareDbUnit(getClass(), "before.xml");
+
+ migration.execute();
+
+ List<Map<String, Object>> rows = db.select("select id from rules");
+ assertThat(rows).hasSize(1);
+ assertThat(rows.get(0).get("ID")).isEqualTo(1L);
+ }
+
+}
diff --git a/sonar-db/src/test/resources/org/sonar/db/version/v55/DeleteManualRulesTest/before.xml b/sonar-db/src/test/resources/org/sonar/db/version/v55/DeleteManualRulesTest/before.xml
new file mode 100644
index 00000000000..41cfb1d19d7
--- /dev/null
+++ b/sonar-db/src/test/resources/org/sonar/db/version/v55/DeleteManualRulesTest/before.xml
@@ -0,0 +1,24 @@
+<dataset>
+
+ <!-- Non manual rule : should not be removed -->
+
+ <rules id="1" name="Null Pointer" plugin_rule_key="S001"
+ plugin_config_key="S1" plugin_name="java" description="[null]" priority="4" status="READY"
+ is_template="[false]" template_id="[null]"
+ tags="bug,performance" system_tags="cwe"
+ created_at="1500000000000" updated_at="1600000000000"
+ />
+
+ <!-- Manual rule : should be removed -->
+
+ <rules id="2" name="Manual" plugin_rule_key="man"
+ plugin_config_key="[null]" plugin_name="manual" description="[null]" priority="4" status="READY"
+ is_template="[false]" template_id="[null]"
+ tags="bug,performance" system_tags="cwe"
+ created_at="1500000000000" updated_at="1600000000000"
+ />
+
+
+</dataset>
+
+
diff --git a/sonar-db/src/test/resources/org/sonar/db/version/v55/DeleteManualRulesTest/schema.sql b/sonar-db/src/test/resources/org/sonar/db/version/v55/DeleteManualRulesTest/schema.sql
new file mode 100644
index 00000000000..71b842e22c0
--- /dev/null
+++ b/sonar-db/src/test/resources/org/sonar/db/version/v55/DeleteManualRulesTest/schema.sql
@@ -0,0 +1,31 @@
+CREATE TABLE "RULES" (
+ "ID" INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1),
+ "PLUGIN_RULE_KEY" VARCHAR(200) NOT NULL,
+ "PLUGIN_NAME" VARCHAR(255) NOT NULL,
+ "DESCRIPTION" VARCHAR(16777215),
+ "DESCRIPTION_FORMAT" VARCHAR(20),
+ "PRIORITY" INTEGER,
+ "IS_TEMPLATE" BOOLEAN DEFAULT FALSE,
+ "TEMPLATE_ID" INTEGER,
+ "PLUGIN_CONFIG_KEY" VARCHAR(200),
+ "NAME" VARCHAR(200),
+ "STATUS" VARCHAR(40),
+ "LANGUAGE" VARCHAR(20),
+ "NOTE_DATA" CLOB(2147483647),
+ "NOTE_USER_LOGIN" VARCHAR(255),
+ "NOTE_CREATED_AT" TIMESTAMP,
+ "NOTE_UPDATED_AT" TIMESTAMP,
+ "REMEDIATION_FUNCTION" VARCHAR(20),
+ "DEF_REMEDIATION_FUNCTION" VARCHAR(20),
+ "REMEDIATION_GAP_MULT" VARCHAR(20),
+ "DEF_REMEDIATION_GAP_MULT" VARCHAR(20),
+ "REMEDIATION_BASE_EFFORT" VARCHAR(20),
+ "DEF_REMEDIATION_BASE_EFFORT" VARCHAR(20),
+ "GAP_DESCRIPTION" VARCHAR(4000),
+ "TAGS" VARCHAR(4000),
+ "SYSTEM_TAGS" VARCHAR(4000),
+ "RULE_TYPE" TINYINT,
+ "CREATED_AT" BIGINT,
+ "UPDATED_AT" BIGINT
+);
+