jro_apps/redmine Commit - r13462:a7378e450d25

Fixed dead locks with SQLServer....

Jean-Philippe Lang -

r13462:a7378e450d25

parent child

Context file:

r13462:a7378e450d25

lib/redmine/nested_set/issue_nested_set.rb +2 -2

                      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

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages