SONAR-5007 fix renaming of table LOGS to ACTIVITIES on Oracle

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 2081f8e9190ca94a91918d58578586f7ac8227fe..70fa98a55762eb18b2133578d558ad5c65a3348e 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 = 548;
+  public static final int LAST_VERSION = 547;
 
   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 dc37a6e684a279eac18563a0d7a8cdf700093689..e1764335391abf5ca09702a4c75c1047680096b3 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
@@ -237,12 +237,10 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('539');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('540');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('541');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('542');
-INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('543');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('544');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('545');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('546');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('547');
-INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('548');
 
 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/540_create_activities_table.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/540_create_activities_table.rb
new file mode 100644 (file)
index 0000000..2c69815
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/540_create_activities_table.rb
@@ -0,0 +1,38 @@
+#
+# 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 4.4
+# SONAR-5329
+#
+class CreateActivitiesTable < ActiveRecord::Migration
+
+  def self.up
+    create_table 'activities'do |t|
+      t.column 'created_at',   :datetime, :null => false
+      t.column 'user_login', :string, :limit => 255
+      t.column 'data_field', :text
+      t.column 'log_type', :string, :limit => 50
+      t.column 'log_message', :string, :limit => 4000
+    end
+
+  end
+
+end

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/540_create_log_table.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/540_create_log_table.rb
deleted file mode 100644 (file)
index 02f466f..0000000
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/540_create_log_table.rb
+++ /dev/null
@@ -1,38 +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 4.4
-# SONAR-5329
-#
-class CreateLogTable < ActiveRecord::Migration
-
-  def self.up
-    create_table 'logs'do |t|
-      t.column 'created_at',   :datetime, :null => false
-      t.column 'execution_time_field', :integer
-      t.column 'user_login', :string, :limit => 255
-      t.column 'data_field', :text
-      t.column 'payload_field', :string, :limit => 40
-    end
-
-  end
-
-end

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/543_add_type_to_log_table.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/543_add_type_to_log_table.rb
deleted file mode 100644 (file)
index 5d8d073..0000000
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/543_add_type_to_log_table.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 4.4
-# SONAR-5329
-#
-class AddTypeToLogTable < ActiveRecord::Migration
-
-  def self.up
-    remove_column 'logs', 'payload_field'
-    add_column 'logs', 'log_type', :string, :limit => 50
-    add_column 'logs', 'log_message', :string
-  end
-
-end

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/548_rename_activities_table.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/548_rename_activities_table.rb
deleted file mode 100644 (file)
index 0fae77d..0000000
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/548_rename_activities_table.rb
+++ /dev/null
@@ -1,31 +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.
-#
-
-#
-# Sonar 2.14
-#
-class RenameActivitiesTable < ActiveRecord::Migration
-
-  def self.up
-    remove_column(:logs, 'execution_time_field')
-    rename_table(:logs, 'activities')
-  end
-
-end