fix #224 (#258)

* fix #224 * fix #242
qiniu · Oct 4, 2022 · d076e1b · d076e1b
1 parent 19f1bba
commit d076e1b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/collection.go b/collection.go
@@ -216,7 +216,10 @@ func (c *Collection) UpdateOne(ctx context.Context, filter interface{}, update i
 
 	res, err := c.collection.UpdateOne(ctx, filter, update, updateOpts)
 	if res != nil && res.MatchedCount == 0 {
-		err = ErrNoSuchDocuments
+		// UpdateOne support upsert function
+		if updateOpts.Upsert == nil || !*updateOpts.Upsert {
+			err = ErrNoSuchDocuments
+		}
 	}
 	if err != nil {
 		return err

diff --git a/collection_test.go b/collection_test.go
@@ -436,6 +436,11 @@ func TestCollection_Update(t *testing.T) {
 	err = cli.UpdateOne(context.Background(), filter2, update2)
 	ast.Equal(err, ErrNoSuchDocuments)
 
+	opt := officialOpts.Update().SetUpsert(true)
+	opts = options.UpdateOptions{UpdateOptions: opt}
+	err = cli.UpdateOne(context.Background(), filter2, update2, opts)
+	ast.NoError(err)
+
 	// filter is nil or wrong BSON Document format
 	update3 := bson.M{
 		"name": "Geek",

diff --git a/middleware/middleware.go b/middleware/middleware.go
@@ -26,9 +26,9 @@ func Register(cb callback) {
 
 // Do call every registers
 // The doc is always the document to operate
-func Do(ctx context.Context, doc interface{}, opType operator.OpType, opts ...interface{}) error {
+func Do(ctx context.Context, content interface{}, opType operator.OpType, opts ...interface{}) error {
 	for _, cb := range middlewareCallback {
-		if err := cb(ctx, doc, opType, opts...); err != nil {
+		if err := cb(ctx, content, opType, opts...); err != nil {
 			return err
 		}
 	}