SONAR-3825 create the table MEASURE_FILTERS

diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseUtils.java b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseUtils.java
index a5f48c1176cbacd6d4fcd120883f9d6fb488c520..c8d1d3f41dab366177d36ad4a2880a927aafa969 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseUtils.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseUtils.java
@@ -66,6 +66,7 @@ public final class DatabaseUtils {
     "loaded_templates",
     "manual_measures",
     "measure_data",
+    "measure_filters",
     "metrics",
     "notifications",
     "projects",

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 ead0244d6d9df7eee7b2395651b2008104f16774..92f576c9a8f387878b141ff3aaf049aac88a0164 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
@@ -32,7 +32,7 @@ import java.util.List;
  */
 public class DatabaseVersion implements BatchComponent, ServerComponent {
 
-  public static final int LAST_VERSION = 355;
+  public static final int LAST_VERSION = 356;
 
   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 fc61fc82ba18b07a1ec5c134d11dfa9c1c704f5e..fbdfac52f67d3f6a377d74ff14f6e449e33ace17 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
@@ -183,6 +183,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('352');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('353');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('354');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('355');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('356');
 
 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-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
index 58dfdbb09dac8d3f2cbc5845d8542bbcbac69287..e67a2a9ef637a2c44197734e1ae7db0c301800dd 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
@@ -514,6 +514,17 @@ CREATE TABLE "SEMAPHORES" (
   "LOCKED_AT" TIMESTAMP
 );
 
+CREATE TABLE "MEASURE_FILTERS" (
+  "ID" INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1),
+  "NAME" VARCHAR(100) NOT NULL,
+  "SHARED" BOOLEAN NOT NULL,
+  "USER_ID" INTEGER,
+  "DESCRIPTION" VARCHAR(4000),
+  "DATA" CLOB(2147483647),
+  "CREATED_AT" TIMESTAMP,
+  "UPDATED_AT" TIMESTAMP
+);
+
 -- ----------------------------------------------
 -- DDL Statements for indexes
 -- ----------------------------------------------
@@ -619,3 +630,5 @@ CREATE UNIQUE INDEX "UNIQ_SEMAPHORE_CHECKSUMS" ON "SEMAPHORES" ("CHECKSUM");
 CREATE INDEX "SEMAPHORE_NAMES" ON "SEMAPHORES" ("NAME");
 
 CREATE UNIQUE INDEX "UNIQ_AUTHOR_LOGINS" ON "AUTHORS" ("LOGIN");
+
+CREATE INDEX "MEASURE_FILTERS_NAME" ON "MEASURE_FILTERS" ("NAME");
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/356_create_measure_filters.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/356_create_measure_filters.rb
new file mode 100644 (file)
index 0000000..4a50f11
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/356_create_measure_filters.rb
@@ -0,0 +1,37 @@
+#
+# Sonar, entreprise quality control tool.
+# Copyright (C) 2008-2012 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 3.4
+#
+class CreateMeasureFilters < ActiveRecord::Migration
+  def self.up
+    create_table 'measure_filters' do |t|
+      t.column 'name', :string, :null => false, :limit => 100
+      t.column 'user_id', :integer, :null => true
+      t.column 'shared', :boolean, :null => true
+      t.column 'description', :string, :null => true, :limit => 4000
+      t.column 'data', :text, :null => true
+      t.timestamps
+    end
+    add_index 'measure_filters', 'name', :name => 'measure_filters_name'
+  end
+end
+