From 08b93cb0363d910be9c29ba694badd54d2e51464 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Tue, 4 Nov 2014 17:30:16 +0100 Subject: [PATCH] SONAR-4950 update the users.updated_at in order to block other sessions --- ...up_roles.rb => 605_remove_duplication_in_group_roles.rb} | 6 ++++-- .../java/org/sonar/core/persistence/DatabaseVersion.java | 2 +- .../main/resources/org/sonar/core/persistence/rows-h2.sql | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) rename server/sonar-web/src/main/webapp/WEB-INF/db/migrate/{602_remove_duplication_in_group_roles.rb => 605_remove_duplication_in_group_roles.rb} (91%) diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/602_remove_duplication_in_group_roles.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/605_remove_duplication_in_group_roles.rb similarity index 91% rename from server/sonar-web/src/main/webapp/WEB-INF/db/migrate/602_remove_duplication_in_group_roles.rb rename to server/sonar-web/src/main/webapp/WEB-INF/db/migrate/605_remove_duplication_in_group_roles.rb index 069b9a3aff4..d39e52b4595 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/602_remove_duplication_in_group_roles.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/605_remove_duplication_in_group_roles.rb @@ -19,8 +19,8 @@ # # -# SonarQube 4.5.1 -# SONAR-4950 Unique constraint cannot be created because it would be on resource_id that is nullable +# SonarQube 4.5.2 +# SONAR-4950 # class RemoveDuplicationInGroupRoles < ActiveRecord::Migration @@ -40,5 +40,7 @@ class RemoveDuplicationInGroupRoles < ActiveRecord::Migration end end end + + add_index 'group_roles', ['group_id', 'resource_id', 'role'], :unique => true, :name => 'uniq_group_roles' end end diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java index 970a1d1b2c1..641d199620a 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java +++ b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java @@ -89,7 +89,7 @@ public class DatabaseVersion implements BatchComponent, ServerComponent { "user_roles", "widgets", "widget_properties" - ); + ); private MyBatis mybatis; public DatabaseVersion(MyBatis mybatis) { diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql index 2d0708f8199..e095183981a 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql +++ b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql @@ -256,9 +256,9 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('583'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('584'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('600'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('601'); -INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('602'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('603'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('604'); +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('605'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('700'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('701'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('702'); -- 2.39.5