diff options
-rw-r--r-- | sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml | 2 | ||||
-rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/db/migrate/260_fix_reviews_with_deleted_user.rb | 1 |
2 files changed, 2 insertions, 1 deletions
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 472874f6dee..1d434ed08c6 100644 --- 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 892fc182177..11b303feabe 100644 --- 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 |