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).

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1002_fix_size_of_snapshots_scope.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1002_fix_size_of_snapshots_scope.rb
deleted file mode 100644 (file)
index 0f3ae67..0000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/1002_fix_size_of_snapshots_scope.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# SonarQube, open source software quality management tool.
-# Copyright (C) 2008-2014 SonarSource
-# mailto:contact AT sonarsource DOT com
-#
-# SonarQube is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 3 of the License, or (at your option) any later version.
-#
-# SonarQube is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-
-#
-# SonarQube 5.3
-# SONAR-7073
-#
-class FixSizeOfSnapshotsScope < ActiveRecord::Migration
-
-  def self.up
-    change_column('snapshots', 'scope', :string, :limit => 3, :null => true)
-  end
-
-end
-
-

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 2faa9191b04d2774cf49b9e926eec2ed702ffe56..aebdd7143a4871d047d15c21ebe9e848134b6175 100644 (file)
--- 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 4f97c05b4d5bf604f23778be658e429aff6ae5d0..9a726809cea3a6c110cb159040c50800002a5ea5 100644 (file)
--- 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;