diff options
| author | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2014-01-09 13:41:38 +0100 |
|---|---|---|
| committer | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2014-01-09 13:41:38 +0100 |
| commit | ac40c604939422e059f4957f6006acab60de39cd (patch) | |
| tree | fb6e3d992b390e74602e41374c3407a4b69ad559 /sonar-core | |
| parent | 401b062486dee16142b73e872b7bb34f8265e17a (diff) | |
| download | sonarqube-ac40c604939422e059f4957f6006acab60de39cd.tar.gz sonarqube-ac40c604939422e059f4957f6006acab60de39cd.zip | |
SONAR-4326 Fix bad merge in DB migration
Diffstat (limited to 'sonar-core')
| -rw-r--r-- | sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java | 2 | ||||
| -rw-r--r-- | sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql | 1 |
2 files changed, 2 insertions, 1 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 fc4187c4048..7b51ce46344 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 = 486; + public static final int LAST_VERSION = 487; public static enum Status { UP_TO_DATE, REQUIRES_UPGRADE, REQUIRES_DOWNGRADE, FRESH_INSTALL 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 d4192efcb7d..281b89e9e26 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 @@ -198,6 +198,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('483'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('484'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('485'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('486'); +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('487'); 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; |