jro_apps/redmine Commit - r12736:2ec3b3694f6b

fix race condition of highest rgt at Issue#update_nested_set_attributes_on_parent_change (#6579)...

Toshi MARUYAMA -

r12736:2ec3b3694f6b

parent child

Context file:

r12736:2ec3b3694f6b

Collapse all files

app/models/issue.rb +1 -2

                     self.root_id = (@parent_issue.nil? ? id : @parent_issue.root_id)
                     cond = ["root_id = ? AND lft >= ? AND rgt <= ? ", old_root_id, lft, rgt]
                     self.class.base_class.select('id').lock(true).where(cond)
-                    target_maxright = nested_set_scope.maximum(right_column_name) || 0
+                    offset = right_most_bound + 1 - lft
-                    offset = target_maxright + 1 - lft
                     Issue.where(cond).
                       update_all(["root_id = ?, lft = lft + ?, rgt = rgt + ?", root_id, offset, offset])
                     self[left_column_name]  = lft + offset

test/unit/issue_nested_set_test.rb +7 -3

                 parent1 = Issue.generate!
                 lft2 = new_issue_lft
                 parent2 = Issue.generate!
+                lft3 = new_issue_lft
                 child = parent1.generate_child!
                 child.parent_issue_id = nil
                 child.save!
                 parent2.reload
                 assert_equal [parent1.id, lft1, lft1 + 1], [parent1.root_id, parent1.lft, parent1.rgt]
                 assert_equal [parent2.id, lft2, lft2 + 1], [parent2.root_id, parent2.lft, parent2.rgt]
-                assert_equal [child.id, 1, 2], [child.root_id, child.lft, child.rgt]
+                assert_equal [child.id,   lft3, lft3 + 1], [child.root_id, child.lft, child.rgt]
               end
               def test_move_a_child_to_another_issue
                 parent1 = Issue.generate!
                 child = parent1.generate_child!
                 grandchild = child.generate_child!
+                lft4 = new_issue_lft
                 child.reload
                 child.project = Project.find(2)
                 assert child.save
                 grandchild.reload
                 parent1.reload
                 assert_equal [1, parent1.id, lft1, lft1 + 1], [parent1.project_id, parent1.root_id, parent1.lft, parent1.rgt]
-                assert_equal [2, child.id, 1, 4], [child.project_id, child.root_id, child.lft, child.rgt]
+                assert_equal [2, child.id, lft4, lft4 + 3],
-                assert_equal [2, child.id, 2, 3], [grandchild.project_id, grandchild.root_id, grandchild.lft, grandchild.rgt]
+                             [child.project_id, child.root_id, child.lft, child.rgt]
+                assert_equal [2, child.id, lft4 + 1, lft4 + 2],
+                             [grandchild.project_id, grandchild.root_id, grandchild.lft, grandchild.rgt]
               end
               def test_moving_an_issue_to_a_descendant_should_not_validate

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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