From: Jean-Philippe Lang Date: Thu, 14 Jul 2016 11:21:16 +0000 (+0000) Subject: Don't pass conditions to #delete_all. X-Git-Tag: 3.4.0~801 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=26c5459de7a525ec4427b33f9c80b7f0c531db78;p=redmine.git Don't pass conditions to #delete_all. git-svn-id: http://svn.redmine.org/redmine/trunk@15662 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/models/user.rb b/app/models/user.rb index 69db92240..a9b2be54d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -820,11 +820,11 @@ class User < Principal Message.where(['author_id = ?', id]).update_all(['author_id = ?', substitute.id]) News.where(['author_id = ?', id]).update_all(['author_id = ?', substitute.id]) # Remove private queries and keep public ones - ::Query.delete_all ['user_id = ? AND visibility = ?', id, ::Query::VISIBILITY_PRIVATE] + ::Query.where('user_id = ? AND visibility = ?', id, ::Query::VISIBILITY_PRIVATE).delete_all ::Query.where(['user_id = ?', id]).update_all(['user_id = ?', substitute.id]) TimeEntry.where(['user_id = ?', id]).update_all(['user_id = ?', substitute.id]) - Token.delete_all ['user_id = ?', id] - Watcher.delete_all ['user_id = ?', id] + Token.where('user_id = ?', id).delete_all + Watcher.where('user_id = ?', id).delete_all WikiContent.where(['author_id = ?', id]).update_all(['author_id = ?', substitute.id]) WikiContent::Version.where(['author_id = ?', id]).update_all(['author_id = ?', substitute.id]) end