SONAR-5013 "My profile" page cannot be displayed when notifications are set on projec...

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 21baa95e89146cb9033a2c5e79ee07a43c7bf1ef..adf752dba8fcbec04b10736578882df4f687a227 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 = 493;
+  public static final int LAST_VERSION = 494;
 
   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 db5b5ab1b55edf066c164556246b539fb2b4dd55..5296108e9610e8034c06c3fbba10034d30901f4e 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
@@ -204,6 +204,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('490');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('491');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('492');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('493');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('494');
 
 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/494_delete_properties_on_unknown_components.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/494_delete_properties_on_unknown_components.rb
new file mode 100644 (file)
index 0000000..b43db8d
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/494_delete_properties_on_unknown_components.rb
@@ -0,0 +1,34 @@
+#
+# SonarQube, open source software quality management tool.
+# Copyright (C) 2008-2013 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 4.2
+# SONAR-5013
+#
+class DeletePropertiesOnUnknownComponents < ActiveRecord::Migration
+
+  class Property < ActiveRecord::Base
+  end
+
+  def self.up
+    Property.delete_all('resource_id IS NOT NULL AND resource_id NOT IN (SELECT id FROM projects)')
+  end
+end
+