aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-db
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2015-11-25 16:11:49 +0100
committerSimon Brandhof <simon.brandhof@sonarsource.com>2015-11-25 16:11:49 +0100
commit6ec3fcf19a77c31b9fe137eabc56334948d39ac8 (patch)
tree3ee94ac6ae81c504d1a19d650f990721a1de2f3a /sonar-db
parent1a8ebb514b9af397207f2305ffa225eca725512b (diff)
downloadsonarqube-6ec3fcf19a77c31b9fe137eabc56334948d39ac8.tar.gz
sonarqube-6ec3fcf19a77c31b9fe137eabc56334948d39ac8.zip
SONAR-7073 revert fix of SNAPSHOTS.SCOPE
Because of O.R.A.C.L.E. It allowed us to create a column with name "scope" but now it fails to alter it because reserved name (only in Oracle btw).
Diffstat (limited to 'sonar-db')
-rw-r--r--sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java2
-rw-r--r--sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql1
2 files changed, 1 insertions, 2 deletions
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 2faa9191b04..aebdd7143a4 100644
--- 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 = 1002;
+ public static final int LAST_VERSION = 1001;
/**
* 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 4f97c05b4d5..9a726809cea 100644
--- 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
@@ -362,7 +362,6 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('940');
INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('941');
INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1000');
INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1001');
-INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1002');
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;