diff options
4 files changed, 35 insertions, 15 deletions
diff --git a/sonar-core/src/main/java/org/sonar/jpa/entity/SchemaMigration.java b/sonar-core/src/main/java/org/sonar/jpa/entity/SchemaMigration.java index b0251fe3da3..83e0774bcd7 100644 --- a/sonar-core/src/main/java/org/sonar/jpa/entity/SchemaMigration.java +++ b/sonar-core/src/main/java/org/sonar/jpa/entity/SchemaMigration.java @@ -40,7 +40,7 @@ public class SchemaMigration { - complete the Derby DDL file used for unit tests : sonar-testing-harness/src/main/resources/org/sonar/test/persistence/sonar-test.ddl */ - public static final int LAST_VERSION = 203; + public static final int LAST_VERSION = 210; public final static String TABLE_NAME = "schema_migrations"; diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb index bd930663577..80976a2a65b 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb @@ -65,12 +65,6 @@ class InitialSchema < ActiveRecord::Migration t.column :description, :text end - create_table :parameters do |t| - t.column :param_key, :string, :null => false, :limit => 100, :null => false - t.column :value, :decimal, :null => false, :precision => 30, :scale => 20 - t.column :value2, :decimal, :null => true, :precision => 30, :scale => 20 - end - create_table :rule_failures do |t| t.column :snapshot_id, :integer, :null => false t.column :rule_id, :integer, :null => false diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/210_drop_parameters_table.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/210_drop_parameters_table.rb new file mode 100644 index 00000000000..f9ac8869054 --- /dev/null +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/210_drop_parameters_table.rb @@ -0,0 +1,34 @@ +# +# Sonar, entreprise quality control tool. +# Copyright (C) 2008-2011 SonarSource +# mailto:contact AT sonarsource DOT com +# +# Sonar 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. +# +# Sonar 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 Sonar; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 +# + +# +# Sonar 2.10 +# +class DropParametersTable < ActiveRecord::Migration + + def self.up + begin + drop_table('parameters') + rescue + # ignore, it's a fresh install + end + end + +end diff --git a/sonar-testing-harness/src/main/resources/org/sonar/test/persistence/sonar-test.ddl b/sonar-testing-harness/src/main/resources/org/sonar/test/persistence/sonar-test.ddl index c8c81e9de40..a2c2ad8d445 100644 --- a/sonar-testing-harness/src/main/resources/org/sonar/test/persistence/sonar-test.ddl +++ b/sonar-testing-harness/src/main/resources/org/sonar/test/persistence/sonar-test.ddl @@ -245,14 +245,6 @@ create table METRICS ( ); CREATE UNIQUE INDEX METRICS_UNIQUE_NAME ON METRICS (NAME); -create table PARAMETERS ( - ID INTEGER not null, - PARAM_KEY VARCHAR(100) not null, - VALUE DECIMAL(30, 20) not null, - VALUE2 DECIMAL(30, 20), - primary key (id) -); - create table PROJECTS ( ID INTEGER not null, NAME VARCHAR(256), |