From 58dba7093e4ba88345844b8f519c0efa5aca59d6 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Fri, 4 Apr 2014 11:12:22 +0200 Subject: [PATCH] Remove migration 523 --- .../core/persistence/DatabaseVersion.java | 2 +- .../org/sonar/core/persistence/rows-h2.sql | 1 - .../migrate/520_add_debt_columns_to_rules.rb | 4 +- .../migrate/523_update_rule_debt_columns.rb | 50 ------------------- 4 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 sonar-server/src/main/webapp/WEB-INF/db/migrate/523_update_rule_debt_columns.rb 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 6af72131229..7d920dacaf2 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 = 523; + public static final int LAST_VERSION = 522; 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 66880b5398d..b924803a886 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 @@ -221,7 +221,6 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('519'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('520'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('521'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('522'); -INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('523'); 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/520_add_debt_columns_to_rules.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/520_add_debt_columns_to_rules.rb index 5af0233dd8c..ef0a8a6aaab 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/520_add_debt_columns_to_rules.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/520_add_debt_columns_to_rules.rb @@ -29,8 +29,8 @@ class AddDebtColumnsToRules < ActiveRecord::Migration add_column 'rules', :default_characteristic_id, :integer, :null => true add_column 'rules', :remediation_function, :string, :null => true, :limit => 20 add_column 'rules', :default_remediation_function, :string, :null => true, :limit => 20 - add_column 'rules', :remediation_factor, :string, :null => true, :limit => 20 - add_column 'rules', :default_remediation_factor, :string, :null => true, :limit => 20 + add_column 'rules', :remediation_coeff, :string, :null => true, :limit => 20 + add_column 'rules', :default_remediation_coeff, :string, :null => true, :limit => 20 add_column 'rules', :remediation_offset, :string, :null => true, :limit => 20 add_column 'rules', :default_remediation_offset, :string, :null => true, :limit => 20 add_column 'rules', :effort_to_fix_description, :string, :null => true, :limit => 4000 diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/523_update_rule_debt_columns.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/523_update_rule_debt_columns.rb deleted file mode 100644 index 9e7b2b72133..00000000000 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/523_update_rule_debt_columns.rb +++ /dev/null @@ -1,50 +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.3 -# -# TO BE DELETED WHEN EXECUTED ON DORY -# -class UpdateRuleDebtColumns < ActiveRecord::Migration - - class Rule < ActiveRecord::Base - end - - def self.up - Metric.reset_column_information - - rename_column(:rules, :remediation_factor, :remediation_coeff) - rename_column(:rules, :default_remediation_factor, :default_remediation_coeff) - - # As CopyRequirementsFromCharacteristicsToRules has been updated to not insert 0X durations, we have update columns to reflect what should have been done. - - Rule.update_all("remediation_coeff=NULL", "remediation_coeff = '0d'" ) - Rule.update_all("remediation_coeff=NULL", "remediation_coeff = '0h'" ) - Rule.update_all("remediation_coeff=NULL", "remediation_coeff = '0min'" ) - Rule.update_all("remediation_coeff=NULL", "remediation_coeff = '0mn'" ) - - Rule.update_all("remediation_offset=NULL", "remediation_offset = '0d'" ) - Rule.update_all("remediation_offset=NULL", "remediation_offset = '0h'" ) - Rule.update_all("remediation_offset=NULL", "remediation_offset = '0min'" ) - Rule.update_all("remediation_offset=NULL", "remediation_offset = '0mn'" ) - end - -end -- 2.39.5