From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 8 Jan 2014 04:03:11 +0000 (+0000)
Subject: Rails4: replace deprecated Relation#update_all at Board model
X-Git-Tag: 2.5.0~396
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6dcfa742fded31c07101d9bea3122f49af83ea12;p=redmine.git

Rails4: replace deprecated Relation#update_all at Board model

git-svn-id: http://svn.redmine.org/redmine/trunk@12503 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/board.rb b/app/models/board.rb
index cb81e0a5a..dbfa8a3d4 100644
--- a/app/models/board.rb
+++ b/app/models/board.rb
@@ -60,10 +60,10 @@ class Board < ActiveRecord::Base
   # Updates topics_count, messages_count and last_message_id attributes for +board_id+
   def self.reset_counters!(board_id)
     board_id = board_id.to_i
-    update_all("topics_count = (SELECT COUNT(*) FROM #{Message.table_name} WHERE board_id=#{board_id} AND parent_id IS NULL)," +
+    where(["id = ?", board_id]).
+      update_all("topics_count = (SELECT COUNT(*) FROM #{Message.table_name} WHERE board_id=#{board_id} AND parent_id IS NULL)," +
                " messages_count = (SELECT COUNT(*) FROM #{Message.table_name} WHERE board_id=#{board_id})," +
-               " last_message_id = (SELECT MAX(id) FROM #{Message.table_name} WHERE board_id=#{board_id})",
-               ["id = ?", board_id])
+               " last_message_id = (SELECT MAX(id) FROM #{Message.table_name} WHERE board_id=#{board_id})")
   end
 
   def self.board_tree(boards, parent_id=nil, level=0)