From 312ffe43c7efa910d3aa987826e4b8b5f358139e Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Fri, 9 Dec 2011 12:08:58 +0000 Subject: [PATCH] Rails3: model: user: use ::Query instead of Query Test fails on Rails 3.0. 
Error:
test_destroy_should_update_wiki_contents(UserTest):
NoMethodError: undefined method `delete_all' for ActiveRecord::AttributeMethods::Query:Module
    app/models/user.rb:602:in `remove_references_before_destroy'
    test/unit/user_test.rb:298:in `test_destroy_should_update_wiki_contents'
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8140 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/user.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index c7b883e6e..efe5b30a3 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -599,8 +599,8 @@ class User < Principal Message.update_all ['author_id = ?', substitute.id], ['author_id = ?', id] News.update_all ['author_id = ?', substitute.id], ['author_id = ?', id] # Remove private queries and keep public ones - Query.delete_all ['user_id = ? AND is_public = ?', id, false] - Query.update_all ['user_id = ?', substitute.id], ['user_id = ?', id] + ::Query.delete_all ['user_id = ? AND is_public = ?', id, false] + ::Query.update_all ['user_id = ?', substitute.id], ['user_id = ?', id] TimeEntry.update_all ['user_id = ?', substitute.id], ['user_id = ?', id] Token.delete_all ['user_id = ?', id] Watcher.delete_all ['user_id = ?', id]