fixed nexted sets insertion

Author: dracony

src/PHPixie/ORM/Relationships/Type/NestedSet/Steps/MoveChild.php

@@ -78,15 +78,15 @@ public function execute()
             $this->prepareNode($child[$idField], $childLeft, $rootId, 0, $parentDepth+1);
         }else{
             //If the child was already moved to the right, we need to compensate for it
-            $childOffset = ($rootId == $child[$rootIdKey] && $child[$leftKey] > $parent[$rightKey]) ? $width : 0;
-
-            $distance = $parent[$rightKey] - $child[$leftKey] - $childOffset;
+            $childOffset = ($rootId == $child[$rootIdKey] && $child[$leftKey] > $childLeft) ? $width : 0;
 
+            $distance = $childLeft - $child[$leftKey] - $childOffset;
+            
             $this->updateQuery()
                 ->increment($leftKey, $distance)
                 ->increment($rightKey, $distance)
                 ->increment($depthKey, $parentDepth+1 - $child[$depthKey])
-                ->set($rootIdKey, $parent[$rootIdKey])
+                ->set($rootIdKey, $rootId)
                 ->where($leftKey, '>=', $child[$leftKey] + $childOffset)
                 ->where($rightKey, '<=', $child[$rightKey] + $childOffset)
                 ->where($rootIdKey, $child[$rootIdKey])

tests/PHPixie/Tests/ORM/Functional/Relationship/NestedSetTest.php

@@ -592,6 +592,43 @@ protected function moveOtherTreeTest()
         $this->assertTree($data);
     }
 
+    public function testMoveWithoutReload()
+    {
+        $this->runTests('moveWithoutReload');
+    }
+
+
+    protected function moveWithoutReloadTest()
+    {
+        $pixie = $this->createEntity('fairy', array('name' => 'Pixie'));
+        $trixie = $this->createEntity('fairy', array('name' => 'Trixie'));
+        $blum = $this->createEntity('fairy', array('name' => 'Blum'));
+        $stella = $this->createEntity('fairy', array('name' => 'Stella'));
+        $pinky = $this->createEntity('fairy', array('name' => 'Pinky'));
+        
+        $pinky->parent->set($stella);
+        $stella->parent->set($blum);
+        
+        $pixie->children->add($trixie);
+        $pixie->children->add($blum);
+        
+        $columns = array('id', 'name', 'left', 'right', 'depth', 'rootId');
+        
+        $expect = array(
+            array('1', 'Pixie', '1', '10', '0', '1'),
+            array('2', 'Trixie', '2', '3', '1', '1'),
+            array('3', 'Blum', '4', '9', '1', '1'),
+            array('4', 'Stella', '5', '8', '2', '1'),
+            array('5', 'Pinky', '6', '7', '3', '1'),
+        );
+        
+        foreach($expect as $key => $value) {
+            $expect[$key] = array_combine($columns, $value);
+        }
+        
+        $this->assertData('fairy', $expect);
+    }
+
     public function testProperties()
     {
         $this->runTests('properties');