Fix PurgeDaoTest

diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
index 472874f6deeb9ddf5f60baa33dfc81c6547cc673..1d434ed08c6a882c6b2380b037131a2f5c8d6163 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
@@ -16,7 +16,7 @@
              build_date="2008-12-02 13:58:00.00"
              version="[null]" path="[null]"/>
 
-  <action_plans id="1" project_id="1" user_id="100" name="SHORT_TERM" description="[null]" deadline="[null]"
+  <action_plans id="1" project_id="1" name="SHORT_TERM" description="[null]" deadline="[null]"
                 user_login="igor" status="[null]" created_at="[null]" updated_at="[null]" />
 
   <action_plans_reviews action_plan_id="1" review_id="250" />

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/260_fix_reviews_with_deleted_user.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/260_fix_reviews_with_deleted_user.rb
index 892fc182177588466724d9c1b47b7de44a8a9e05..11b303feabe629d227951f95497d6ff027c565c5 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/260_fix_reviews_with_deleted_user.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/260_fix_reviews_with_deleted_user.rb
@@ -25,6 +25,7 @@ class FixReviewsWithDeletedUser < ActiveRecord::Migration
 
   def self.up
     # For http://jira.codehaus.org/browse/SONAR-3102
+    must_save=false
     Review.find(:all, :include => ['assignee', 'user']).each do |review|
       if review.user_id && !review.user
         review.user_id=nil