diff options
7 files changed, 66 insertions, 6 deletions
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 e200d553f7a..ead0244d6d9 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 @@ -32,7 +32,7 @@ import java.util.List; */ public class DatabaseVersion implements BatchComponent, ServerComponent { - public static final int LAST_VERSION = 353; + public static final int LAST_VERSION = 355; 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 b6abb1db23a..fc61fc82ba1 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 @@ -181,6 +181,8 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('350'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('351'); 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 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 f4d01e85b6f..58dfdbb09da 100644 --- 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 @@ -132,8 +132,8 @@ CREATE TABLE "SNAPSHOTS" ( "SCOPE" VARCHAR(3), "QUALIFIER" VARCHAR(10), "ROOT_SNAPSHOT_ID" INTEGER, - "VERSION" VARCHAR(60), - "PATH" VARCHAR(96), + "VERSION" VARCHAR(500), + "PATH" VARCHAR(500), "DEPTH" INTEGER, "ROOT_PROJECT_ID" INTEGER, "PERIOD1_MODE" VARCHAR(100), diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/database/model/Snapshot.java b/sonar-plugin-api/src/main/java/org/sonar/api/database/model/Snapshot.java index f0a5cf93df6..6af64feb22f 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/database/model/Snapshot.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/database/model/Snapshot.java @@ -58,7 +58,7 @@ public class Snapshot extends BaseIdentifiable { @Column(name = "created_at", updatable = true, nullable = true) private Date createdAt; - @Column(name = "version", updatable = true, nullable = true, length = 60) + @Column(name = "version", updatable = true, nullable = true, length = 500) private String version; @Column(name = "islast") @@ -73,7 +73,7 @@ public class Snapshot extends BaseIdentifiable { @Column(name = "scope", updatable = true, nullable = true, length = 3) private String scope; - @Column(name = "path", updatable = true, nullable = true, length = 96) + @Column(name = "path", updatable = true, nullable = true, length = 500) private String path; @Column(name = "depth", updatable = true, nullable = true) diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/353_increase_group_name_size.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/353_increase_group_name_size.rb index 5aa183970f5..18952d396c3 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/353_increase_group_name_size.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/353_increase_group_name_size.rb @@ -24,6 +24,6 @@ class IncreaseGroupNameSize < ActiveRecord::Migration def self.up - change_column :groups, :name, :string, :limit => 255, :null => true + change_column :groups, :name, :string, :limit => 500, :null => true end end diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/354_increase_snapshots_path_size.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/354_increase_snapshots_path_size.rb new file mode 100644 index 00000000000..1f21e43fca6 --- /dev/null +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/354_increase_snapshots_path_size.rb @@ -0,0 +1,29 @@ +# +# Sonar, open source software quality management 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 IncreaseSnapshotsPathSize < ActiveRecord::Migration + + def self.up + change_column :snapshots, :path, :string, :limit => 500, :null => true + end +end diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/355_increase_snapshots_version_size.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/355_increase_snapshots_version_size.rb new file mode 100644 index 00000000000..af5afd91e8f --- /dev/null +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/355_increase_snapshots_version_size.rb @@ -0,0 +1,29 @@ +# +# Sonar, open source software quality management 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 IncreaseSnapshotsVersionSize < ActiveRecord::Migration + + def self.up + change_column :snapshots, :version, :string, :limit => 500, :null => true + end +end |