Merge pull request #11 from fpietka/delete-non-recursive

Delete non recursive - Fix #2

Author: fpietka

library/Nestedset/Model.php

@@ -197,7 +197,7 @@ public function delete($id, $recursive = true)
 
  $select = $db
  ->select()
- ->from($this->_tableName, array($this->_structure['left'], $this->_structure['right']))
+ ->from($this->_tableName, array($this->_structure['id'], $this->_structure['left'], $this->_structure['right']))
  ->where($this->_structure['id'] . ' = ?', $id);
 
  $stmt = $db->query($select);
@@ -209,8 +209,9 @@ public function delete($id, $recursive = true)
 
  if ($isRecursive) {
  (new NestedSet_Model_Builder)->deleteRecursive($this, $result);
- } else {
- // @TODO
+ }
+ else {
+ (new NestedSet_Model_Builder)->deleteNonRecursive($this, $result);
  }
 
  return $this;

library/Nestedset/Model/Builder.php

@@ -256,4 +256,69 @@ public function deleteRecursive(NestedSet_Model $nestedset, array $tree)
 
  return $this;
  }
+
+ /**
+ * Delete a node, but move all its children outside first
+ *
+ * @param $model|NestedSet_Model Nested set model
+ * @param $tree|array
+ *
+ * @return $this
+ */
+ public function deleteNonRecursive(NestedSet_Model $nestedset, array $tree)
+ {
+ $db = $nestedset->getDb();
+
+ $left = (int) $tree[$nestedset->getStructureLeft()];
+ $right = (int) $tree[$nestedset->getStructureRight()];
+
+ try {
+ $db->beginTransaction();
+
+ $delete = $db->delete($nestedset->getTableName(), "{$nestedset->getStructureId()} = {$tree[$nestedset->getStructureId()]}");
+
+ // update other elements
+ $width = 2;
+
+ // update right for inner elements
+ $stmt = $db->query("
+ UPDATE {$nestedset->getTableName()}
+ SET {$nestedset->getStructureRight()} = {$nestedset->getStructureRight()} - 1
+ WHERE {$nestedset->getStructureLeft()} > $left AND {$nestedset->getStructureRight()} < $right
+ ");
+ $update = $stmt->fetch();
+
+ // update left for inner elements
+ $stmt = $db->query("
+ UPDATE {$nestedset->getTableName()}
+ SET {$nestedset->getStructureLeft()} = {$nestedset->getStructureLeft()} - 1
+ WHERE {$nestedset->getStructureLeft()} > $left AND {$nestedset->getStructureRight()} < $right
+ ");
+ $update = $stmt->fetch();
+
+ // update right for outer elements
+ $stmt = $db->query("
+ UPDATE {$nestedset->getTableName()}
+ SET {$nestedset->getStructureRight()} = {$nestedset->getStructureRight()} - $width
+ WHERE {$nestedset->getStructureRight()} > $right
+ ");
+ $update = $stmt->fetch();
+
+ // update left for outer elements
+ $stmt = $db->query("
+ UPDATE {$nestedset->getTableName()}
+ SET {$nestedset->getStructureLeft()} = {$nestedset->getStructureLeft()} - $width
+ WHERE {$nestedset->getStructureLeft()} > $left AND {$nestedset->getStructureRight()} >= $right
+ ");
+ $update = $stmt->fetch();
+
+ $db->commit();
+ }
+ catch (Exception $e) {
+ $db->rollBack();
+ throw $e;
+ }
+
+ return $this;
+ }
 }

tests/expected_result_complex_non_recursive_delete.json

@@ -0,0 +1 @@
+[{"id":"3","name":"main","lft":"1","rgt":"14","depth":"0","children":[{"id":"4","name":"foo","lft":"2","rgt":"9","depth":"1","children":[{"id":"6","name":"one","lft":"3","rgt":"4","depth":"2","children":[]},{"id":"7","name":"two","lft":"5","rgt":"6","depth":"2","children":[]},{"id":"8","name":"three","lft":"7","rgt":"8","depth":"2","children":[]}]},{"id":"9","name":"one","lft":"10","rgt":"11","depth":"1","children":[]},{"id":"10","name":"two","lft":"12","rgt":"13","depth":"1","children":[]}]}]

tests/expected_result_simple_non_recursive_delete.json

@@ -0,0 +1 @@
+[{"id":"2","name":"bar","lft":"1","rgt":"2","depth":"0","children":[]}]

tests/unit/library/Nestedset/ModelTest.php

@@ -169,6 +169,45 @@ public function testDeleteRecursiveElement()
  $this->assertEquals($nestedset->toJson(), $expected_result);
  }
 
+ public function testDeleteNonRecursiveElement()
+ {
+ $nestedset = new NestedSet_Model();
+
+ $db = Zend_Db::factory('Pdo_Sqlite', array('dbname' => 'tests/test.db'));
+ $nestedset->setDb($db);
+ $nestedset->setTableName('nested');
+
+ $nestedset->add('foo');
+ $nestedset->add('bar', 1);
+ $nestedset->delete(1, false);
+
+ $expected_result = file_get_contents('tests/expected_result_simple_non_recursive_delete.json');
+
+ $this->assertEquals($nestedset->toJson(), $expected_result);
+
+ // clear it up
+ $nestedset->delete(2, true);
+
+ // More complex case
+ $nestedset->add('main');
+
+ $nestedset->add('foo', 3);
+ $nestedset->add('bar', 3);
+
+ $nestedset->add('one', 4);
+ $nestedset->add('two', 4);
+ $nestedset->add('three', 4);
+
+ $nestedset->add('one', 5);
+ $nestedset->add('two', 5);
+
+ $nestedset->delete(5, false);
+
+ $expected_result = file_get_contents('tests/expected_result_complex_non_recursive_delete.json');
+
+ $this->assertEquals($nestedset->toJson(), $expected_result);
+ }
+
  public function testGetElement()
  {
  $nestedset = new NestedSet_Model();