Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-01 02:46:13 +01:00
Code Issues Packages Projects Releases Activity

Fixed dead locks with SQLServer.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@13844 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-01-07 20:57:52 +00:00
parent ded15dfc80
commit a7378e450d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/redmine/nested_set/issue_nested_set.rb
View File

@@ -153,8 +153,8 @@ module Redmine
if self.class.connection.adapter_name =~ /sqlserver/i
lock = "WITH (ROWLOCK HOLDLOCK UPDLOCK)"
end
sets_to_lock = [id, parent_id].compact
self.class.reorder(:id).where("root_id IN (SELECT root_id FROM #{self.class.table_name} WHERE id IN (?))", sets_to_lock).lock(lock).ids
sets_to_lock = [root_id, parent.try(:root_id)].compact.uniq
self.class.reorder(:id).where(:root_id => sets_to_lock).lock(lock).ids
end
def nested_set_scope