wip

FerretDB · noisersup · Jan 13, 2023 · Jan 4, 2023 · Jan 4, 2023 · Jan 5, 2023
commit f3d6fa88d912695b98f2f5f3ad85b403a20e2795
@@ -508,23 +508,39 @@ func TestUpdateFieldCompatRename(t *testing.T) {
 		//"Nested": {
 		//	update: bson.D{{"$rename", bson.D{{"v", bson.D{{"array", ""}}}}}},
 		//},
-		"DotDocument": {
-			update: bson.D{{"$rename", bson.D{{"v.foo", "v.boo"}}}},
-		},
 		"DotDocumentMove": {
 			update: bson.D{{"$rename", bson.D{{"v.foo", "boo"}}}},
 		},
 		"DotDocumentDuplicate": {
 			update: bson.D{{"$rename", bson.D{{"v.foo", "v.array"}}}},
 		},
-		//"DotDocumentNonExisting": {
-		//	update:     bson.D{{"$rename", bson.D{{"foo.bar", ""}}}},
-		//	resultType: emptyResult,
-		//},
-		//"DotArrayField": {
-		//	update: bson.D{{"$rename", bson.D{{"v.array.0", ""}}}},
-		//	skip:   "https://github.com/FerretDB/FerretDB/issues/1242",
-		//},
+		"DotDocumentNonExisting": {
+			update:     bson.D{{"$rename", bson.D{{"foo.bar", ""}}}},
+			resultType: emptyResult,
+		},
+		"DotArrayField": {
+			update:     bson.D{{"$rename", bson.D{{"v.array.0", ""}}}},
+			resultType: emptyResult,
+			//skip:   "https://github.com/FerretDB/FerretDB/issues/1242",
+		},
+
+		"Same": {
+			update: bson.D{{"$rename", bson.D{{"v", "v"}}}},
+		},
+
+		"MultipleDiff": {
+			update: bson.D{{"$rename", bson.D{{"v.foo", "v.bar"}, {"v.42", "v.43"}}}},
+		},
+
+		"Multiple": {
+			update: bson.D{{"$rename", bson.D{{"v", "foo"}, {"foo", "bar"}}}},
+		},
+		"MultipleSame": {
+			update: bson.D{{"$rename", bson.D{{"v", "foo"}, {"foo", "v"}}}},
+		},
+		"MultipleSame2": {
+			update: bson.D{{"$rename", bson.D{{"v", "foo"}, {"v", "boo"}}}},
+		},
 		//"DotArrayNonExisting": {
 		//	update:     bson.D{{"$rename", bson.D{{"foo.0.baz", int32(1)}}}},
 		//	resultType: emptyResult,
@@ -533,14 +549,37 @@ func TestUpdateFieldCompatRename(t *testing.T) {
 		//	update:     bson.D{{"$rename", bson.D{{"v", ""}, {"v", ""}}}},
 		//	resultType: emptyResult,
 		//},
-		//"Empty": {
-		//	update:     bson.D{{"$rename", bson.D{}}},
-		//	resultType: emptyResult,
-		//},
+		"Empty": {
+			update:     bson.D{{"$rename", bson.D{}}},
+			resultType: emptyResult,
+		},
 		//"DocumentField": {
 		//	update:     bson.D{{"$rename", bson.D{{"foo", ""}}}},
-		//	resultType: emptyResult,
+		//	resulttype: emptyresult,
 		//},
+
+		"FieldDoc": {
+			update: bson.D{{"$rename", bson.D{{"name", primitive.D{}}}}},
+		},
+
+		"FieldArray": {
+			update: bson.D{{"$rename", bson.D{{"name", primitive.A{}}}}},
+		},
+		"FieldNaN": {
+			update: bson.D{{"$rename", bson.D{{"name", math.NaN()}}}},
+		},
+		"FieldNil": {
+			update: bson.D{{"$rename", bson.D{{"name", nil}}}},
+		},
+		"RenameString": {
+			update: bson.D{{"$rename", "string"}},
+		},
+		"RenameNil": {
+			update: bson.D{{"$rename", nil}},
+		},
+		"RenameDoc": {
+			update: bson.D{{"$rename", primitive.D{}}},
+		},
 	}
 
 	testUpdateCompat(t, testCases)

@@ -257,49 +257,27 @@ func processRenameFieldExpression(doc *types.Document, updateV any) (bool, error
 			continue
 		}
 
-		// TODO: test multiple keys, one invalid
 		if key == "" || renameRawValue == "" {
 			return changed, NewWriteErrorMsg(ErrEmptyName, "An empty update path is not valid.")
 		}
 
 		path := types.NewPathFromString(key)
-		//if !doc.HasByPath(keyPath) {
-		//	return changed,
-		//}
-
-		//if path.Len() > 1 && !doc.HasByPath(path) {
-		//	return changed, NewWriteErrorMsg(1, fmt.Sprintf(
-		//		"cannot use the part (%s of %s) to traverse the element (%v)",
-		//		path.Slice()[:1],
-		//		path.Slice(),
-		//	),
-		//	)
-		//}
 
 		renameValue, ok := renameRawValue.(string)
 		if !ok {
-			// TODO: test for invalid _id values
-			panic(1)
+			return changed, NewWriteErrorMsg(2, fmt.Sprintf("the 'to' field for $rename must be a string: %s: %v", key, renameRawValue))
 		}
 
 		renamePath := types.NewPathFromString(renameValue)
 
-		//if _, err := doc.Get(key); err != nil {
-		//	return changed, nil
-		//}
-
-		// TODO: test for non existing key
-		// TODO: check if key exists
-		// [{"foo":"aaa"},{"boo":"aaa"}]
-		// eg. { $rename: {"foo","boo"}}
-
 		var val any
 
 		if path.Len() > 1 {
 			pathVal, err := doc.GetByPath(path)
 			if err != nil {
 				if strings.Contains(err.Error(), "key not found") {
-					return changed, nil
+					continue
+					//return changed, nil
 				}
 				//TODO: differentiate between key not found and can't access <type> by path
 				return changed, NewWriteErrorMsg(28, err.Error())