support for non array walk removals

Author: erh

bsonutil.go

@@ -148,15 +148,19 @@ func BSONWalk(doc bson.D, pathString string, visitor BSONWalkVisitor) (bson.D, e
 var DELETE_ME = fmt.Errorf("delete_me")
 
 func BSONWalkHelp(doc bson.D, path []string, visitor BSONWalkVisitor, inArray bool) (bson.D, error) {
+	prev := doc
 	current := doc
 
+	docPath := []int{}
+
 	for pieceOffset, piece := range path {
 		idx := BSONIndexOf(current, piece)
 		//fmt.Printf("XX %d %s %d\n", pieceOffset, piece, idx)
 
 		if idx < 0 {
 			return doc, nil
 		}
+		docPath = append(docPath, idx)
 
 		elem := &(current)[idx]
 
@@ -171,7 +175,13 @@ func BSONWalkHelp(doc bson.D, path []string, visitor BSONWalkVisitor, inArray bo
 					if inArray {
 						return bson.D{}, DELETE_ME
 					} else {
-						panic("hi")
+						fixed := append(current[0:idx], current[idx+1:]...)
+						if pieceOffset == 0 {
+							return fixed, nil
+						}
+
+						prev[docPath[len(docPath)-2]].Value = fixed
+						return doc, nil
 					}
 				}
 
@@ -185,6 +195,7 @@ func BSONWalkHelp(doc bson.D, path []string, visitor BSONWalkVisitor, inArray bo
 
 		switch val := elem.Value.(type) {
 		case bson.D:
+			prev = current
 			current = val
 		case []bson.D:
 			numDeleted := 0

bsonutil_test.go

@@ -164,3 +164,79 @@ func TestBSONWalk6(test *testing.T) {
 	}
 
 }
+
+func TestBSONWalk7(test *testing.T) {
+	doc := bson.D{{"a", 111}, {"b", 3}}
+	walker := &testWalker{}
+	doc, err := BSONWalk(doc, "a", walker)
+	if err != nil {
+		test.Errorf("why did we get an error %s", err)
+	}
+	if len(doc) != 1 {
+		test.Errorf("didn't delete 1 %s", doc)
+	}
+	if doc[0].Name != "b" {
+		test.Errorf("deleted wrong one? %s", doc)
+	}
+
+}
+
+func TestBSONWalk8(test *testing.T) {
+	doc := bson.D{{"b", 11}, {"a", 111}}
+	walker := &testWalker{}
+	doc, err := BSONWalk(doc, "a", walker)
+	if err != nil {
+		test.Errorf("why did we get an error %s", err)
+	}
+	if len(doc) != 1 {
+		test.Errorf("didn't delete 1 %s", doc)
+	}
+	if doc[0].Name != "b" {
+		test.Errorf("deleted wrong one? %s", doc)
+	}
+
+}
+
+func TestBSONWalk9(test *testing.T) {
+	doc := bson.D{{"b", 11}, {"a", 111}, {"c", 12}}
+	walker := &testWalker{}
+	doc, err := BSONWalk(doc, "a", walker)
+	if err != nil {
+		test.Errorf("why did we get an error %s", err)
+	}
+	if len(doc) != 2 {
+		test.Errorf("didn't delete 1 %s", doc)
+	}
+	if doc[0].Name != "b" {
+		test.Errorf("deleted wrong one? %s", doc)
+	}
+	if doc[1].Name != "c" {
+		test.Errorf("deleted wrong one? %s", doc)
+	}
+
+}
+
+func TestBSONWalk10(test *testing.T) {
+	doc := bson.D{{"b", 11}, {"a", bson.D{{"x", 1}, {"y", 111}}}, {"c", 12}}
+	walker := &testWalker{}
+	doc, err := BSONWalk(doc, "a.y", walker)
+	if err != nil {
+		test.Errorf("why did we get an error %s", err)
+	}
+	if len(doc) != 3 {
+		test.Errorf("what did i do! %s", doc)
+	}
+
+	if doc[1].Name != "a" {
+		test.Errorf("what did i do! %s", doc)
+	}
+
+	sub := doc[1].Value.(bson.D)
+	if len(sub) != 1 {
+		test.Errorf("didn't delete %s", doc)
+	}
+	if sub[0].Name != "x" {
+		test.Errorf("deleted wrong one? %s", doc)
+	}
+
+}