Merge pull request #209 from echotj/mgo_v1

jiangz222 · web-flow · commit 44616146c7e1 · 2021-10-22T13:51:00.000+08:00
add options(createcollections_options files),support abundant options(like Time Series) in mongodb5.x version
diff --git a/database.go b/database.go
@@ -64,3 +64,19 @@ func (d *Database) RunCommand(ctx context.Context, runCommand interface{}, opts
 	}
 	return d.database.RunCommand(ctx, runCommand, option)
 }
+
+// CreateCollection executes a create command to explicitly create a new collection with the specified name on the
+// server. If the collection being created already exists, this method will return a mongo.CommandError. This method
+// requires driver version 1.4.0 or higher.
+//
+// The opts parameter can be used to specify options for the operation (see the options.CreateCollectionOptions
+// documentation).
+func (db *Database) CreateCollection(ctx context.Context, name string, opts ...opts.CreateCollectionOptions) error {
+	var option  = make([]*options.CreateCollectionOptions,0,len(opts))
+	for _,opt := range opts{
+		if opt.CreateCollectionOptions != nil{
+			option = append(option,opt.CreateCollectionOptions)
+		}
+	}
+	return db.database.CreateCollection(ctx,name,option...)
+}
diff --git a/database_test.go b/database_test.go
@@ -66,3 +66,21 @@ func TestRunCommand(t *testing.T) {
 		{"ping", 1}}, opts)
 	ast.NoError(res.Err())
 }
+
+//func TestCreateCollection(t *testing.T) {
+//	ast := require.New(t)
+//
+//	cli := initClient("test")
+//
+//	timeSeriesOpt := options.TimeSeriesOptions{
+//		TimeField:"timestamp",
+//	}
+//	timeSeriesOpt.SetMetaField("metadata")
+//	ctx := context.Background()
+//	createCollectionOpts := opts.CreateCollectionOptions{CreateCollectionOptions: options.CreateCollection().SetTimeSeriesOptions(&timeSeriesOpt)}
+//	if err := cli.CreateCollection(ctx, "syslog", createCollectionOpts); err != nil {
+//		ast.NoError(err)
+//	}
+//	cli.DropCollection(ctx)
+//	cli.DropDatabase(ctx)
+//}
diff --git a/options/createcollection_options.go b/options/createcollection_options.go
@@ -0,0 +1,7 @@
+package options
+
+import "go.mongodb.org/mongo-driver/mongo/options"
+
+type CreateCollectionOptions struct {
+	*options.CreateCollectionOptions
+}
