diff options
| author | Fabrice Bellingard <bellingard@gmail.com> | 2012-02-10 18:43:25 +0100 |
|---|---|---|
| committer | Fabrice Bellingard <bellingard@gmail.com> | 2012-02-10 18:43:25 +0100 |
| commit | c2cb97c242b64f0815d01ed5fa193fffadc97bca (patch) | |
| tree | f46591e7a1eb2177213fcdad8c01fe51ea837a3d /sonar-core | |
| parent | b8009697f24b3cf75cf90021f09c8161388ed0a6 (diff) | |
| download | sonarqube-c2cb97c242b64f0815d01ed5fa193fffadc97bca.tar.gz sonarqube-c2cb97c242b64f0815d01ed5fa193fffadc97bca.zip | |
SONAR-3258 No more delete users in the Sonar DB but deactivate them
- When deleting:
- user is deactivated ('active' set to false)
- its roles are deleted
- its properties are deleted
- its filters & active filters are deleted
- its dashbaords & active dashboards are deleted
- Login is now not possible for deactivated users
Diffstat (limited to 'sonar-core')
3 files changed, 4 insertions, 2 deletions
diff --git a/sonar-core/src/main/java/org/sonar/jpa/entity/SchemaMigration.java b/sonar-core/src/main/java/org/sonar/jpa/entity/SchemaMigration.java index 2cddd8ca3b8..5b77f98c423 100644 --- a/sonar-core/src/main/java/org/sonar/jpa/entity/SchemaMigration.java +++ b/sonar-core/src/main/java/org/sonar/jpa/entity/SchemaMigration.java @@ -34,7 +34,7 @@ public class SchemaMigration { public final static int VERSION_UNKNOWN = -1; - public static final int LAST_VERSION = 256; + public static final int LAST_VERSION = 257; public static final int VERSION_2_13 = 241; public final static String TABLE_NAME = "schema_migrations"; diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-derby.sql b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-derby.sql index 5bc729a4199..26a063c5a2e 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-derby.sql +++ b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-derby.sql @@ -174,6 +174,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('252'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('254'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('255'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('256'); +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('257'); 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', '2011-09-26 22:27:48.0', '2011-09-26 22:27:48.0', null, null); ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2; diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-derby.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-derby.ddl index 33f37c08298..99696f47e54 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-derby.ddl +++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-derby.ddl @@ -395,7 +395,8 @@ CREATE TABLE "USERS" ( "CREATED_AT" TIMESTAMP, "UPDATED_AT" TIMESTAMP, "REMEMBER_TOKEN" VARCHAR(500), - "REMEMBER_TOKEN_EXPIRES_AT" TIMESTAMP + "REMEMBER_TOKEN_EXPIRES_AT" TIMESTAMP, + "ACTIVE" BOOLEAN DEFAULT TRUE, ); CREATE TABLE "FILTERS" ( |