SONAR-6226 Remove index on external identity columns

The index is too big on MySQL

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1013_add_unique_index_on_users_identity_columns.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1013_add_unique_index_on_users_identity_columns.rb
deleted file mode 100644 (file)
index 51fa402..0000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1013_add_unique_index_on_users_identity_columns.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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.4
-# SONAR-6226
-#
-class AddUniqueIndexOnUsersIdentityColumns < ActiveRecord::Migration
-
-  def self.up
-    add_index :users, [:external_identity, :external_identity_provider], :name => 'uniq_users_identity'
-  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 43be9647d12529f046563e131f6e79756acad4c0..011218e59008c08096d08f0903328d3388ad4aac 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
@@ -29,7 +29,7 @@ import org.sonar.db.MyBatis;
 
 public class DatabaseVersion {
 
-  public static final int LAST_VERSION = 1013;
+  public static final int LAST_VERSION = 1012;
 
   /**
    * 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 c225c4c782ac190a421fb80e5c09e56b713792c6..0b2d72f002820273bf496d7073161facd1731349 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
@@ -374,7 +374,6 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1009');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1010');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1011');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1012');
-INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1013');
 
 INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', '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 ff5efccc4911839c2be7aeb123d1018daf2395f6..d6d582573ac35a670078b74bf750228780d8d7da 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
@@ -681,8 +681,6 @@ CREATE INDEX "ISSUE_FILTER_FAVS_USER" ON "ISSUE_FILTER_FAVOURITES" ("USER_LOGIN"
 
 CREATE UNIQUE INDEX "USERS_LOGIN" ON "USERS" ("LOGIN");
 
-CREATE UNIQUE INDEX "UNIQ_USERS_IDENTITY" ON "USERS" ("EXTERNAL_IDENTITY", "EXTERNAL_IDENTITY_PROVIDER");
-
 CREATE INDEX "USERS_UPDATED_AT" ON "USERS" ("UPDATED_AT");
 
 CREATE INDEX "SNAPSHOTS_ROOT_PROJECT_ID" ON "SNAPSHOTS" ("ROOT_PROJECT_ID");