SONAR-6613 remove useless indexes on table GROUP_ROLES

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1152_remove_useless_indexes_on_group_roles.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1152_remove_useless_indexes_on_group_roles.rb
new file mode 100644 (file)
index 0000000..f7ca1ab
--- /dev/null
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1152_remove_useless_indexes_on_group_roles.rb
@@ -0,0 +1,32 @@
+#
+# SonarQube, open source software quality management tool.
+# Copyright (C) 2008-2014 SonarSource
+# mailto:contact AT sonarsource DOT com
+#
+# SonarQube 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.
+#
+# SonarQube 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.
+#
+
+#
+# SonarQube 5.6
+# SONAR-6613
+#
+class RemoveUselessIndexesOnGroupRoles < ActiveRecord::Migration
+
+  def self.up
+    remove_index :group_roles, :name => 'group_roles_group'
+    remove_index :group_roles, :name => 'group_roles_role'
+  end
+
+end

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 112412ef9b72d07c70b4895e69cf503c4305c68d..4302118b8536febdc02285589861fd91f3ad7f47 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java
@@ -30,7 +30,7 @@ import org.sonar.db.MyBatis;
 
 public class DatabaseVersion {
 
-  public static final int LAST_VERSION = 1_151;
+  public static final int LAST_VERSION = 1_152;
 
   /**
    * The minimum supported version which can be upgraded. Lower

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 9bf805b030fa02093e450c84c462063dc07663f5..072ed69e95403241a17e7320f4b717415333ee70 100644 (file)
--- 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
@@ -405,6 +405,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1125');
 
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1150');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1151');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1152');
 
 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/main/resources/org/sonar/db/version/schema-h2.ddl b/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
index 4b00eea977c222b000fa8b2224fed22e22b64e07..b56666e9637ba6ff8c84f01366c920e6a8474e52 100644 (file)
--- a/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
+++ b/sonar-db/src/main/resources/org/sonar/db/version/schema-h2.ddl
@@ -541,8 +541,6 @@ CREATE UNIQUE INDEX "ACTIVITIES_LOG_KEY" ON "ACTIVITIES" ("LOG_KEY");
 
 CREATE INDEX "GROUP_ROLES_RESOURCE" ON "GROUP_ROLES" ("RESOURCE_ID");
 
-CREATE INDEX "GROUP_ROLES_GROUP" ON "GROUP_ROLES" ("GROUP_ID");
-
 CREATE INDEX "USER_ROLES_RESOURCE" ON "USER_ROLES" ("RESOURCE_ID");
 
 CREATE INDEX "USER_ROLES_USER" ON "USER_ROLES" ("USER_ID");
@@ -645,8 +643,6 @@ CREATE INDEX "USERS_UPDATED_AT" ON "USERS" ("UPDATED_AT");
 
 CREATE INDEX "SNAPSHOTS_ROOT_PROJECT_ID" ON "SNAPSHOTS" ("ROOT_PROJECT_ID");
 
-CREATE INDEX "GROUP_ROLES_ROLE" ON "GROUP_ROLES" ("ROLE");
-
 CREATE UNIQUE INDEX "UNIQ_GROUP_ROLES" ON "GROUP_ROLES" ("GROUP_ID", "RESOURCE_ID", "ROLE");
 
 CREATE UNIQUE INDEX "RULES_REPO_KEY" ON "RULES" ("PLUGIN_NAME", "PLUGIN_RULE_KEY");