SONAR-4326 Move DB migration

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 3c49b2584a87757e1cf0fe2e7bb7e4ce4f579c3f..c6aa0cc296c582f5abd15491ba34764211b7044a 100644 (file)
--- 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 = 488;
+  public static final int LAST_VERSION = 489;
 
   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 b39afa8b96782d9f9bd74646cf956c4018669511..0cd78edcbcda305e0f390624d09316a1ef803cc6 100644 (file)
--- 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,8 +198,8 @@ 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 SCHEMA_MIGRATIONS(VERSION) VALUES ('488');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('489');
 
 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-server/src/main/webapp/WEB-INF/db/migrate/487_add_rule_tags.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/487_add_rule_tags.rb
deleted file mode 100644 (file)
index 83098a0..0000000
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/487_add_rule_tags.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# SonarQube, open source software quality management tool.
-# Copyright (C) 2008-2013 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.
-#
-
-#
-# Sonar 4.2
-#
-class AddRuleTags < ActiveRecord::Migration
-
-  def self.up
-    create_table :rule_tags do |t|
-      t.column :tag,                :string,      :null => true,    :limit => 100
-    end
-    create_table :rules_rule_tags do |t|
-      t.column :rule_id,            :integer,     :null => false
-      t.column :rule_tag_id,        :integer,     :null => false
-      t.column :tag_type,           :string,      :null => true,    :limit => 20
-    end
-    begin
-      add_index 'rules_rule_tags', ['rule_id', 'rule_tag_id'], :unique => true, :name => 'uniq_rule_tags'
-    rescue
-      # ignore
-    end
-  end
-
-end

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/489_add_rule_tags.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/489_add_rule_tags.rb
new file mode 100644 (file)
index 0000000..83098a0
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/489_add_rule_tags.rb
@@ -0,0 +1,42 @@
+#
+# SonarQube, open source software quality management tool.
+# Copyright (C) 2008-2013 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.
+#
+
+#
+# Sonar 4.2
+#
+class AddRuleTags < ActiveRecord::Migration
+
+  def self.up
+    create_table :rule_tags do |t|
+      t.column :tag,                :string,      :null => true,    :limit => 100
+    end
+    create_table :rules_rule_tags do |t|
+      t.column :rule_id,            :integer,     :null => false
+      t.column :rule_tag_id,        :integer,     :null => false
+      t.column :tag_type,           :string,      :null => true,    :limit => 20
+    end
+    begin
+      add_index 'rules_rule_tags', ['rule_id', 'rule_tag_id'], :unique => true, :name => 'uniq_rule_tags'
+    rescue
+      # ignore
+    end
+  end
+
+end