diff options
| author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2014-12-10 18:22:55 +0100 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@sonarsource.com> | 2014-12-10 18:22:55 +0100 |
| commit | 01624e779ab58c043edf1367dc1831bb5fa89b57 (patch) | |
| tree | 53f6259559c646fbc37c0592a8d26e5fba4b3317 /sonar-core/src | |
| parent | 2cb2c8f4c55e201dda7dca0f27d85059feeb6b5e (diff) | |
| download | sonarqube-01624e779ab58c043edf1367dc1831bb5fa89b57.tar.gz sonarqube-01624e779ab58c043edf1367dc1831bb5fa89b57.zip | |
SONAR-5919 Add USERS.SCM_ACCOUNTS column
Diffstat (limited to 'sonar-core/src')
3 files changed, 8 insertions, 5 deletions
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 e4de173996f..5da2b41df2c 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 @@ -33,7 +33,7 @@ import java.util.List; */ public class DatabaseVersion implements BatchComponent, ServerComponent { - public static final int LAST_VERSION = 754; + public static final int LAST_VERSION = 756; /** * List of all the tables.n @@ -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 44722fe3358..04a1e72303d 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 @@ -283,6 +283,8 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('751'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('752'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('753'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('754'); +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('755'); +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('756'); 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-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl index 9b434e00a20..54392299488 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl +++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl @@ -323,11 +323,12 @@ CREATE TABLE "USERS" ( "EMAIL" VARCHAR(100), "CRYPTED_PASSWORD" VARCHAR(40), "SALT" VARCHAR(40), - "CREATED_AT" BIGINT, - "UPDATED_AT" BIGINT, "REMEMBER_TOKEN" VARCHAR(500), "REMEMBER_TOKEN_EXPIRES_AT" TIMESTAMP, - "ACTIVE" BOOLEAN DEFAULT TRUE + "ACTIVE" BOOLEAN DEFAULT TRUE, + "SCM_ACCOUNTS" VARCHAR(4000), + "CREATED_AT" BIGINT, + "UPDATED_AT" BIGINT ); CREATE TABLE "DASHBOARDS" ( |