From 26d542c9a2aa5e64df0d77f71f04c8e22373f95a Mon Sep 17 00:00:00 2001 From: viktor Date: Tue, 21 Apr 2026 18:41:32 +0200 Subject: [PATCH] added mongo-driver v2 --- bfcodegen/id-generate.template | 19 +++++------ cursortoken/filter.go | 3 +- cursortoken/tokenKeySort.go | 15 ++++---- exerr/builder.go | 4 +-- exerr/constructor.go | 7 ++-- exerr/dataCategory.go | 54 ++++++----------------------- exerr/dataSeverity.go | 54 ++++++----------------------- exerr/dataType.go | 53 +++++------------------------ exerr/data_test.go | 32 +++++++++--------- exerr/meta.go | 24 ++++++------- go.mod | 5 +-- go.sum | 62 ++-------------------------------- mongoext/pipeline.go | 4 +-- mongoext/projections.go | 3 +- mongoext/registry.go | 44 +++--------------------- pagination/filter.go | 5 +-- reflectext/primStrSer.go | 15 ++++---- rfctime/date.go | 58 ++++++++----------------------- rfctime/rfc3339.go | 53 +++++------------------------ rfctime/rfc3339Nano.go | 56 ++++++------------------------ rfctime/seconds.go | 56 ++++++------------------------ wmo/collection.go | 8 ++--- wmo/decoding.go | 3 +- wmo/mongo.go | 2 +- wmo/queryAggregate.go | 11 +++--- wmo/queryDelete.go | 5 +-- wmo/queryFind.go | 30 ++++++++-------- wmo/queryFindOne.go | 5 +-- wmo/queryInsert.go | 5 +-- wmo/queryList.go | 7 ++-- wmo/queryPaginate.go | 7 ++-- wmo/queryUpdate.go | 7 ++-- wmo/reflection_test.go | 11 +++--- 33 files changed, 205 insertions(+), 522 deletions(-) diff --git a/bfcodegen/id-generate.template b/bfcodegen/id-generate.template index 6d9af2e..eddf863 100644 --- a/bfcodegen/id-generate.template +++ b/bfcodegen/id-generate.template @@ -2,9 +2,7 @@ package {{.PkgName}} -import "go.mongodb.org/mongo-driver/bson" -import "go.mongodb.org/mongo-driver/bson/bsontype" -import "go.mongodb.org/mongo-driver/bson/primitive" +import "go.mongodb.org/mongo-driver/v2/bson" import "git.blackforestbytes.com/BlackForestBytes/goext/exerr" const ChecksumIDGenerator = "{{.Checksum}}" // GoExtVersion: {{.GoextVersion}} @@ -13,9 +11,10 @@ const ChecksumIDGenerator = "{{.Checksum}}" // GoExtVersion: {{.GoextVersion}} // ================================ {{.Name}} ({{.FileRelative}}) ================================ -func (i {{.Name}}) MarshalBSONValue() (bsontype.Type, []byte, error) { - if objId, err := primitive.ObjectIDFromHex(string(i)); err == nil { - return bson.MarshalValue(objId) +func (i {{.Name}}) MarshalBSONValue() (byte, []byte, error) { + if objId, err := bson.ObjectIDFromHex(string(i)); err == nil { + tp, data, err := bson.MarshalValue(objId) + return byte(tp), data, err } else { return 0, nil, exerr.New(exerr.TypeMarshalEntityID, "Failed to marshal {{.Name}}("+i.String()+") to ObjectId").Str("value", string(i)).Type("type", i).Build() } @@ -25,12 +24,12 @@ func (i {{.Name}}) String() string { return string(i) } -func (i {{.Name}}) ObjID() (primitive.ObjectID, error) { - return primitive.ObjectIDFromHex(string(i)) +func (i {{.Name}}) ObjID() (bson.ObjectID, error) { + return bson.ObjectIDFromHex(string(i)) } func (i {{.Name}}) Valid() bool { - _, err := primitive.ObjectIDFromHex(string(i)) + _, err := bson.ObjectIDFromHex(string(i)) return err == nil } @@ -50,7 +49,7 @@ func (i {{.Name}}) IsZero() bool { } func New{{.Name}}() {{.Name}} { - return {{.Name}}(primitive.NewObjectID().Hex()) + return {{.Name}}(bson.NewObjectID().Hex()) } {{end}} \ No newline at end of file diff --git a/cursortoken/filter.go b/cursortoken/filter.go index 4aa3b29..f63c124 100644 --- a/cursortoken/filter.go +++ b/cursortoken/filter.go @@ -2,7 +2,8 @@ package cursortoken import ( "context" - "go.mongodb.org/mongo-driver/mongo" + + "go.mongodb.org/mongo-driver/v2/mongo" ) type RawFilter interface { diff --git a/cursortoken/tokenKeySort.go b/cursortoken/tokenKeySort.go index 4b03bb6..fd48165 100644 --- a/cursortoken/tokenKeySort.go +++ b/cursortoken/tokenKeySort.go @@ -3,8 +3,9 @@ package cursortoken import ( "encoding/base32" "encoding/json" - "go.mongodb.org/mongo-driver/bson/primitive" "time" + + "go.mongodb.org/mongo-driver/v2/bson" ) type CTKeySort struct { @@ -119,18 +120,18 @@ func (c CTKeySort) IsStart() bool { return c.Mode == CTMStart } -func (c CTKeySort) valuePrimaryObjectId() (primitive.ObjectID, bool) { - if oid, err := primitive.ObjectIDFromHex(c.ValuePrimary); err == nil { +func (c CTKeySort) valuePrimaryObjectId() (bson.ObjectID, bool) { + if oid, err := bson.ObjectIDFromHex(c.ValuePrimary); err == nil { return oid, true } else { - return primitive.ObjectID{}, false + return bson.ObjectID{}, false } } -func (c CTKeySort) valueSecondaryObjectId() (primitive.ObjectID, bool) { - if oid, err := primitive.ObjectIDFromHex(c.ValueSecondary); err == nil { +func (c CTKeySort) valueSecondaryObjectId() (bson.ObjectID, bool) { + if oid, err := bson.ObjectIDFromHex(c.ValueSecondary); err == nil { return oid, true } else { - return primitive.ObjectID{}, false + return bson.ObjectID{}, false } } diff --git a/exerr/builder.go b/exerr/builder.go index 7b70051..fc789eb 100644 --- a/exerr/builder.go +++ b/exerr/builder.go @@ -16,7 +16,7 @@ import ( "git.blackforestbytes.com/BlackForestBytes/goext/langext" "github.com/gin-gonic/gin" "github.com/rs/zerolog" - "go.mongodb.org/mongo-driver/bson/primitive" + "go.mongodb.org/mongo-driver/v2/bson" ) // @@ -253,7 +253,7 @@ func (b *Builder) Bytes(key string, val []byte) *Builder { return b.addMeta(key, MDTBytes, val) } -func (b *Builder) ObjectID(key string, val primitive.ObjectID) *Builder { +func (b *Builder) ObjectID(key string, val bson.ObjectID) *Builder { return b.addMeta(key, MDTObjectID, val) } diff --git a/exerr/constructor.go b/exerr/constructor.go index d150610..8486ba3 100644 --- a/exerr/constructor.go +++ b/exerr/constructor.go @@ -3,10 +3,11 @@ package exerr import ( "encoding/json" "fmt" - "go.mongodb.org/mongo-driver/bson/primitive" - "git.blackforestbytes.com/BlackForestBytes/goext/langext" "reflect" "time" + + "git.blackforestbytes.com/BlackForestBytes/goext/langext" + "go.mongodb.org/mongo-driver/v2/bson" ) var reflectTypeStr = reflect.TypeOf("") @@ -223,7 +224,7 @@ func getReflectedMetaValues(value interface{}, remainingDepth int) map[string]Me return map[string]MetaValue{"": {DataType: MDTIntArray, Value: ifraw}} case []int32: return map[string]MetaValue{"": {DataType: MDTInt32Array, Value: ifraw}} - case primitive.ObjectID: + case bson.ObjectID: return map[string]MetaValue{"": {DataType: MDTObjectID, Value: ifraw}} case []string: return map[string]MetaValue{"": {DataType: MDTStringArray, Value: ifraw}} diff --git a/exerr/dataCategory.go b/exerr/dataCategory.go index f2aef8f..ced8453 100644 --- a/exerr/dataCategory.go +++ b/exerr/dataCategory.go @@ -4,11 +4,8 @@ import ( "encoding/json" "errors" "fmt" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsoncodec" - "go.mongodb.org/mongo-driver/bson/bsonrw" - "go.mongodb.org/mongo-driver/bson/bsontype" - "reflect" + + "go.mongodb.org/mongo-driver/v2/bson" ) type ErrorCategory struct{ Category string } @@ -28,8 +25,8 @@ func (e ErrorCategory) MarshalJSON() ([]byte, error) { return json.Marshal(e.Category) } -func (e *ErrorCategory) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { - if bt == bson.TypeNull { +func (e *ErrorCategory) UnmarshalBSONValue(bt byte, data []byte) error { + if bson.Type(bt) == bson.TypeNull { // we can't set nil in UnmarshalBSONValue (so we use default(struct)) // Use mongoext.CreateGoExtBsonRegistry if you need to unmarsh pointer values // https://stackoverflow.com/questions/75167597 @@ -37,11 +34,11 @@ func (e *ErrorCategory) UnmarshalBSONValue(bt bsontype.Type, data []byte) error *e = ErrorCategory{} return nil } - if bt != bson.TypeString { - return errors.New(fmt.Sprintf("cannot unmarshal %v into String", bt)) + if bson.Type(bt) != bson.TypeString { + return errors.New(fmt.Sprintf("cannot unmarshal %v into String", bson.Type(bt))) } var tt string - err := bson.RawValue{Type: bt, Value: data}.Unmarshal(&tt) + err := bson.RawValue{Type: bson.Type(bt), Value: data}.Unmarshal(&tt) if err != nil { return err } @@ -49,40 +46,9 @@ func (e *ErrorCategory) UnmarshalBSONValue(bt bsontype.Type, data []byte) error return nil } -func (e ErrorCategory) MarshalBSONValue() (bsontype.Type, []byte, error) { - return bson.MarshalValue(e.Category) -} - -func (e ErrorCategory) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error { - if val.Kind() == reflect.Ptr && val.IsNil() { - if !val.CanSet() { - return errors.New("ValueUnmarshalerDecodeValue") - } - val.Set(reflect.New(val.Type().Elem())) - } - - tp, src, err := bsonrw.Copier{}.CopyValueToBytes(vr) - if err != nil { - return err - } - - if val.Kind() == reflect.Ptr && len(src) == 0 { - val.Set(reflect.Zero(val.Type())) - return nil - } - - err = e.UnmarshalBSONValue(tp, src) - if err != nil { - return err - } - - if val.Kind() == reflect.Ptr { - val.Set(reflect.ValueOf(&e)) - } else { - val.Set(reflect.ValueOf(e)) - } - - return nil +func (e ErrorCategory) MarshalBSONValue() (byte, []byte, error) { + tp, data, err := bson.MarshalValue(e.Category) + return byte(tp), data, err } //goland:noinspection GoUnusedGlobalVariable diff --git a/exerr/dataSeverity.go b/exerr/dataSeverity.go index 18a6529..293e418 100644 --- a/exerr/dataSeverity.go +++ b/exerr/dataSeverity.go @@ -4,11 +4,8 @@ import ( "encoding/json" "errors" "fmt" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsoncodec" - "go.mongodb.org/mongo-driver/bson/bsonrw" - "go.mongodb.org/mongo-driver/bson/bsontype" - "reflect" + + "go.mongodb.org/mongo-driver/v2/bson" ) type ErrorSeverity struct{ Severity string } @@ -30,8 +27,8 @@ func (e ErrorSeverity) MarshalJSON() ([]byte, error) { return json.Marshal(e.Severity) } -func (e *ErrorSeverity) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { - if bt == bson.TypeNull { +func (e *ErrorSeverity) UnmarshalBSONValue(bt byte, data []byte) error { + if bson.Type(bt) == bson.TypeNull { // we can't set nil in UnmarshalBSONValue (so we use default(struct)) // Use mongoext.CreateGoExtBsonRegistry if you need to unmarsh pointer values // https://stackoverflow.com/questions/75167597 @@ -39,11 +36,11 @@ func (e *ErrorSeverity) UnmarshalBSONValue(bt bsontype.Type, data []byte) error *e = ErrorSeverity{} return nil } - if bt != bson.TypeString { - return errors.New(fmt.Sprintf("cannot unmarshal %v into String", bt)) + if bson.Type(bt) != bson.TypeString { + return errors.New(fmt.Sprintf("cannot unmarshal %v into String", bson.Type(bt))) } var tt string - err := bson.RawValue{Type: bt, Value: data}.Unmarshal(&tt) + err := bson.RawValue{Type: bson.Type(bt), Value: data}.Unmarshal(&tt) if err != nil { return err } @@ -51,40 +48,9 @@ func (e *ErrorSeverity) UnmarshalBSONValue(bt bsontype.Type, data []byte) error return nil } -func (e ErrorSeverity) MarshalBSONValue() (bsontype.Type, []byte, error) { - return bson.MarshalValue(e.Severity) -} - -func (e ErrorSeverity) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error { - if val.Kind() == reflect.Ptr && val.IsNil() { - if !val.CanSet() { - return errors.New("ValueUnmarshalerDecodeValue") - } - val.Set(reflect.New(val.Type().Elem())) - } - - tp, src, err := bsonrw.Copier{}.CopyValueToBytes(vr) - if err != nil { - return err - } - - if val.Kind() == reflect.Ptr && len(src) == 0 { - val.Set(reflect.Zero(val.Type())) - return nil - } - - err = e.UnmarshalBSONValue(tp, src) - if err != nil { - return err - } - - if val.Kind() == reflect.Ptr { - val.Set(reflect.ValueOf(&e)) - } else { - val.Set(reflect.ValueOf(e)) - } - - return nil +func (e ErrorSeverity) MarshalBSONValue() (byte, []byte, error) { + tp, data, err := bson.MarshalValue(e.Severity) + return byte(tp), data, err } //goland:noinspection GoUnusedGlobalVariable diff --git a/exerr/dataType.go b/exerr/dataType.go index 8e3b4dc..cab272d 100644 --- a/exerr/dataType.go +++ b/exerr/dataType.go @@ -4,14 +4,10 @@ import ( "encoding/json" "errors" "fmt" - "reflect" "git.blackforestbytes.com/BlackForestBytes/goext/dataext" "git.blackforestbytes.com/BlackForestBytes/goext/langext" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsoncodec" - "go.mongodb.org/mongo-driver/bson/bsonrw" - "go.mongodb.org/mongo-driver/bson/bsontype" + "go.mongodb.org/mongo-driver/v2/bson" ) type ErrorType struct { @@ -81,8 +77,8 @@ func (e ErrorType) MarshalJSON() ([]byte, error) { return json.Marshal(e.Key) } -func (e *ErrorType) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { - if bt == bson.TypeNull { +func (e *ErrorType) UnmarshalBSONValue(bt byte, data []byte) error { + if bson.Type(bt) == bson.TypeNull { // we can't set nil in UnmarshalBSONValue (so we use default(struct)) // Use mongoext.CreateGoExtBsonRegistry if you need to unmarsh pointer values // https://stackoverflow.com/questions/75167597 @@ -90,11 +86,11 @@ func (e *ErrorType) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { *e = ErrorType{} return nil } - if bt != bson.TypeString { - return errors.New(fmt.Sprintf("cannot unmarshal %v into String", bt)) + if bson.Type(bt) != bson.TypeString { + return errors.New(fmt.Sprintf("cannot unmarshal %v into String", bson.Type(bt))) } var tt string - err := bson.RawValue{Type: bt, Value: data}.Unmarshal(&tt) + err := bson.RawValue{Type: bson.Type(bt), Value: data}.Unmarshal(&tt) if err != nil { return err } @@ -108,40 +104,9 @@ func (e *ErrorType) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { } } -func (e ErrorType) MarshalBSONValue() (bsontype.Type, []byte, error) { - return bson.MarshalValue(e.Key) -} - -func (e ErrorType) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error { - if val.Kind() == reflect.Ptr && val.IsNil() { - if !val.CanSet() { - return errors.New("ValueUnmarshalerDecodeValue") - } - val.Set(reflect.New(val.Type().Elem())) - } - - tp, src, err := bsonrw.Copier{}.CopyValueToBytes(vr) - if err != nil { - return err - } - - if val.Kind() == reflect.Ptr && len(src) == 0 { - val.Set(reflect.Zero(val.Type())) - return nil - } - - err = e.UnmarshalBSONValue(tp, src) - if err != nil { - return err - } - - if val.Kind() == reflect.Ptr { - val.Set(reflect.ValueOf(&e)) - } else { - val.Set(reflect.ValueOf(e)) - } - - return nil +func (e ErrorType) MarshalBSONValue() (byte, []byte, error) { + tp, data, err := bson.MarshalValue(e.Key) + return byte(tp), data, err } var registeredTypes = dataext.SyncMap[string, ErrorType]{} diff --git a/exerr/data_test.go b/exerr/data_test.go index 8687e22..65b0992 100644 --- a/exerr/data_test.go +++ b/exerr/data_test.go @@ -3,12 +3,12 @@ package exerr import ( "context" "encoding/json" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/primitive" - "go.mongodb.org/mongo-driver/mongo" - "git.blackforestbytes.com/BlackForestBytes/goext/tst" "testing" "time" + + "git.blackforestbytes.com/BlackForestBytes/goext/tst" + "go.mongodb.org/mongo-driver/v2/bson" + "go.mongodb.org/mongo-driver/v2/mongo" ) func TestJSONMarshalErrorCategory(t *testing.T) { @@ -57,7 +57,7 @@ func TestBSONMarshalErrorCategory(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), 350*time.Millisecond) defer cancel() - client, err := mongo.Connect(ctx) + client, err := mongo.Connect() if err != nil { t.Skip("Skip test - no local mongo found") return @@ -68,7 +68,7 @@ func TestBSONMarshalErrorCategory(t *testing.T) { return } - primimd := primitive.NewObjectID() + primimd := bson.NewObjectID() _, err = client.Database("_test").Collection("goext-cicd").InsertOne(ctx, bson.M{"_id": primimd, "val": CatSystem}) tst.AssertNoErr(t, err) @@ -76,8 +76,8 @@ func TestBSONMarshalErrorCategory(t *testing.T) { cursor := client.Database("_test").Collection("goext-cicd").FindOne(ctx, bson.M{"_id": primimd, "val": bson.M{"$type": "string"}}) var c1 struct { - ID primitive.ObjectID `bson:"_id"` - Val ErrorCategory `bson:"val"` + ID bson.ObjectID `bson:"_id"` + Val ErrorCategory `bson:"val"` } err = cursor.Decode(&c1) @@ -90,7 +90,7 @@ func TestBSONMarshalErrorSeverity(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), 350*time.Millisecond) defer cancel() - client, err := mongo.Connect(ctx) + client, err := mongo.Connect() if err != nil { t.Skip("Skip test - no local mongo found") return @@ -101,7 +101,7 @@ func TestBSONMarshalErrorSeverity(t *testing.T) { return } - primimd := primitive.NewObjectID() + primimd := bson.NewObjectID() _, err = client.Database("_test").Collection("goext-cicd").InsertOne(ctx, bson.M{"_id": primimd, "val": SevErr}) tst.AssertNoErr(t, err) @@ -109,8 +109,8 @@ func TestBSONMarshalErrorSeverity(t *testing.T) { cursor := client.Database("_test").Collection("goext-cicd").FindOne(ctx, bson.M{"_id": primimd, "val": bson.M{"$type": "string"}}) var c1 struct { - ID primitive.ObjectID `bson:"_id"` - Val ErrorSeverity `bson:"val"` + ID bson.ObjectID `bson:"_id"` + Val ErrorSeverity `bson:"val"` } err = cursor.Decode(&c1) @@ -123,7 +123,7 @@ func TestBSONMarshalErrorType(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), 350*time.Millisecond) defer cancel() - client, err := mongo.Connect(ctx) + client, err := mongo.Connect() if err != nil { t.Skip("Skip test - no local mongo found") return @@ -134,7 +134,7 @@ func TestBSONMarshalErrorType(t *testing.T) { return } - primimd := primitive.NewObjectID() + primimd := bson.NewObjectID() _, err = client.Database("_test").Collection("goext-cicd").InsertOne(ctx, bson.M{"_id": primimd, "val": TypeNotImplemented}) tst.AssertNoErr(t, err) @@ -142,8 +142,8 @@ func TestBSONMarshalErrorType(t *testing.T) { cursor := client.Database("_test").Collection("goext-cicd").FindOne(ctx, bson.M{"_id": primimd, "val": bson.M{"$type": "string"}}) var c1 struct { - ID primitive.ObjectID `bson:"_id"` - Val ErrorType `bson:"val"` + ID bson.ObjectID `bson:"_id"` + Val ErrorType `bson:"val"` } err = cursor.Decode(&c1) diff --git a/exerr/meta.go b/exerr/meta.go index e16b495..64eaa7e 100644 --- a/exerr/meta.go +++ b/exerr/meta.go @@ -5,14 +5,14 @@ import ( "encoding/json" "errors" "fmt" - "git.blackforestbytes.com/BlackForestBytes/goext/langext" - "github.com/rs/zerolog" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/primitive" "math" "strconv" "strings" "time" + + "git.blackforestbytes.com/BlackForestBytes/goext/langext" + "github.com/rs/zerolog" + "go.mongodb.org/mongo-driver/v2/bson" ) // This is a buffed up map[string]any @@ -99,7 +99,7 @@ func (v MetaValue) SerializeValue() (string, error) { case MDTBytes: return hex.EncodeToString(v.Value.([]byte)), nil case MDTObjectID: - return v.Value.(primitive.ObjectID).Hex(), nil + return v.Value.(bson.ObjectID).Hex(), nil case MDTTime: return strconv.FormatInt(v.Value.(time.Time).Unix(), 10) + "|" + strconv.FormatInt(int64(v.Value.(time.Time).Nanosecond()), 10), nil case MDTDuration: @@ -178,7 +178,7 @@ func (v MetaValue) ShortString(lim int) string { case MDTBytes: return langext.StrLimit(hex.EncodeToString(v.Value.([]byte)), lim, "...") case MDTObjectID: - return v.Value.(primitive.ObjectID).Hex() + return v.Value.(bson.ObjectID).Hex() case MDTTime: return v.Value.(time.Time).Format(time.RFC3339) case MDTDuration: @@ -266,7 +266,7 @@ func (v MetaValue) Apply(key string, evt *zerolog.Event, limitLen *int) *zerolog case MDTBytes: return evt.Bytes(key, v.Value.([]byte)) case MDTObjectID: - return evt.Str(key, v.Value.(primitive.ObjectID).Hex()) + return evt.Str(key, v.Value.(bson.ObjectID).Hex()) case MDTTime: return evt.Time(key, v.Value.(time.Time)) case MDTDuration: @@ -460,7 +460,7 @@ func (v *MetaValue) Deserialize(value string, datatype metaDataType) error { v.DataType = datatype return nil case MDTObjectID: - r, err := primitive.ObjectIDFromHex(value) + r, err := bson.ObjectIDFromHex(value) if err != nil { return err } @@ -577,7 +577,7 @@ func (v MetaValue) ValueString() string { case MDTBytes: return hex.EncodeToString(v.Value.([]byte)) case MDTObjectID: - return v.Value.(primitive.ObjectID).Hex() + return v.Value.(bson.ObjectID).Hex() case MDTTime: return v.Value.(time.Time).Format(time.RFC3339Nano) case MDTDuration: @@ -628,8 +628,8 @@ func (v MetaValue) rawValueForJson() any { if v.Value.(AnyWrap).IsError { return bson.M{"@error": true} } - jsonobj := primitive.M{} - jsonarr := primitive.A{} + jsonobj := bson.M{} + jsonarr := bson.A{} if err := json.Unmarshal([]byte(v.Value.(AnyWrap).Json), &jsonobj); err == nil { return jsonobj } else if err := json.Unmarshal([]byte(v.Value.(AnyWrap).Json), &jsonarr); err == nil { @@ -654,7 +654,7 @@ func (v MetaValue) rawValueForJson() any { return v.Value.(time.Time).Format(time.RFC3339Nano) } if v.DataType == MDTObjectID { - return v.Value.(primitive.ObjectID).Hex() + return v.Value.(bson.ObjectID).Hex() } if v.DataType == MDTNil { return nil diff --git a/go.mod b/go.mod index ae8a797..e6bb838 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/jmoiron/sqlx v1.4.0 github.com/rs/xid v1.6.0 github.com/rs/zerolog v1.35.0 - go.mongodb.org/mongo-driver v1.17.9 + go.mongodb.org/mongo-driver/v2 v2.5.1 golang.org/x/crypto v0.50.0 golang.org/x/sys v0.43.0 golang.org/x/term v0.42.0 @@ -37,7 +37,6 @@ require ( github.com/go-playground/validator/v10 v10.30.2 // indirect github.com/goccy/go-json v0.10.6 // indirect github.com/goccy/go-yaml v1.19.2 // indirect - github.com/golang/snappy v1.0.0 // indirect github.com/google/uuid v1.5.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.18.5 // indirect @@ -48,7 +47,6 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect - github.com/montanaflynn/stats v0.9.0 // indirect github.com/pelletier/go-toml/v2 v2.3.0 // indirect github.com/quic-go/qpack v0.6.0 // indirect github.com/quic-go/quic-go v0.59.0 // indirect @@ -64,7 +62,6 @@ require ( github.com/xuri/efp v0.0.1 // indirect github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 // indirect github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect - go.mongodb.org/mongo-driver/v2 v2.5.0 // indirect golang.org/x/arch v0.26.0 // indirect golang.org/x/image v0.39.0 // indirect golang.org/x/text v0.36.0 // indirect diff --git a/go.sum b/go.sum index 1e32b75..d530b4f 100644 --- a/go.sum +++ b/go.sum @@ -3,19 +3,14 @@ filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4 github.com/360EntSecGroup-Skylar/excelize v1.4.1 h1:l55mJb6rkkaUzOpSsgEeKYtS6/0gHwBYyfo5Jcjv/Ks= github.com/360EntSecGroup-Skylar/excelize v1.4.1/go.mod h1:vnax29X2usfl7HHkBrX5EvSCJcmH3dT9luvxzu8iGAE= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= -github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M= -github.com/bytedance/gopkg v0.1.3/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM= github.com/bytedance/gopkg v0.1.4 h1:oZnQwnX82KAIWb7033bEwtxvTqXcYMxDBaQxo5JJHWM= github.com/bytedance/gopkg v0.1.4/go.mod h1:v1zWfPm21Fb+OsyXN2VAHdL6TBb2L88anLQgdyje6R4= github.com/bytedance/sonic v1.15.0 h1:/PXeWFaR5ElNcVE84U0dOHjiMHQOwNIx3K4ymzh/uSE= github.com/bytedance/sonic v1.15.0/go.mod h1:tFkWrPz0/CUCLEF4ri4UkHekCIcdnkqXw9VduqpJh0k= -github.com/bytedance/sonic/loader v0.5.0 h1:gXH3KVnatgY7loH5/TkeVyXPfESoqSBSBEiDd5VjlgE= -github.com/bytedance/sonic/loader v0.5.0/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo= github.com/bytedance/sonic/loader v0.5.1 h1:Ygpfa9zwRCCKSlrp5bBP/b/Xzc3VxsAW+5NIYXrOOpI= github.com/bytedance/sonic/loader v0.5.1/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo= github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M= github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU= -github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -25,8 +20,6 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/gabriel-vasile/mimetype v1.4.13 h1:46nXokslUBsAJE/wMsp5gtO500a4F3Nkz9Ufpk2AcUM= github.com/gabriel-vasile/mimetype v1.4.13/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= -github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w= -github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM= github.com/gin-contrib/sse v1.1.1 h1:uGYpNwTacv5R68bSGMapo62iLTRa9l5zxGCps4hK6ko= github.com/gin-contrib/sse v1.1.1/go.mod h1:QXzuVkA0YO7o/gun03UI1Q+FTI8ZV/n5t03kIQAI89s= github.com/gin-gonic/gin v1.12.0 h1:b3YAbrZtnf8N//yjKeU2+MQsh2mY5htkZidOM7O0wG8= @@ -39,8 +32,6 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.30.1 h1:f3zDSN/zOma+w6+1Wswgd9fLkdwy06ntQJp0BBvFG0w= -github.com/go-playground/validator/v10 v10.30.1/go.mod h1:oSuBIQzuJxL//3MelwSLD5hc2Tu889bF0Idm9Dg26cM= github.com/go-playground/validator/v10 v10.30.2 h1:JiFIMtSSHb2/XBUbWM4i/MpeQm9ZK2xqPNk8vgvu5JQ= github.com/go-playground/validator/v10 v10.30.2/go.mod h1:mAf2pIOVXjTEBrwUMGKkCWKKPs9NheYGabeB04txQSc= github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= @@ -49,9 +40,6 @@ github.com/goccy/go-json v0.10.6 h1:p8HrPJzOakx/mn/bQtjgNjdTcN+/S6FcG2CTtQOrHVU= github.com/goccy/go-json v0.10.6/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM= github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= -github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs= -github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -68,8 +56,6 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jung-kurt/gofpdf v1.16.2 h1:jgbatWHfRlPYiK85qgevsZTHviWXKwB1TTiKdz5PtRc= github.com/jung-kurt/gofpdf v1.16.2/go.mod h1:1hl7y57EsiPAkLbOwzpzqgx1A30nQCk/YmFV8S2vmK0= -github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c= -github.com/klauspost/compress v1.18.4/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= @@ -78,13 +64,8 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= -github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-isatty v0.0.21 h1:xYae+lCNBP7QuW4PUnNG61ffM4hVIfm+zUzDuSzYLGs= github.com/mattn/go-isatty v0.0.21/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= @@ -96,17 +77,10 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= -github.com/montanaflynn/stats v0.8.2 h1:52wnefTJnPI5FoHif1DQh2soKRw0yYs+4AVyvtcZCH0= -github.com/montanaflynn/stats v0.8.2/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= -github.com/montanaflynn/stats v0.9.0 h1:tsBJ0RXwph9BmAuFoCmqGv6e8xa0MENQ8m0ptKq29mQ= -github.com/montanaflynn/stats v0.9.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= -github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= -github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/pelletier/go-toml/v2 v2.3.0 h1:k59bC/lIZREW0/iVaQR8nDHxVq8OVlIzYCOJf421CaM= github.com/pelletier/go-toml/v2 v2.3.0/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/phpdave11/gofpdi v1.0.7/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8= @@ -115,19 +89,12 @@ github.com/quic-go/quic-go v0.59.0 h1:OLJkp1Mlm/aS7dpKgTc6cnpynnD2Xg7C1pwL6vy/SA github.com/quic-go/quic-go v0.59.0/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM= -github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk= github.com/richardlehane/mscfb v1.0.6 h1:eN3bvvZCp00bs7Zf52bxNwAx5lJDBK1tCuH19qq5aC8= github.com/richardlehane/mscfb v1.0.6/go.mod h1:pe0+IUIc0AHh0+teNzBlJCtSyZdFOGgV4ZK9bsoV+Jo= -github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg= -github.com/richardlehane/msoleps v1.0.4 h1:WuESlvhX3gH2IHcd8UqyCuFY5yiq/GR/yqaSM/9/g00= -github.com/richardlehane/msoleps v1.0.4/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg= github.com/richardlehane/msoleps v1.0.6 h1:9BvkpjvD+iUBalUY4esMwv6uBkfOip/Lzvd93jvR9gg= github.com/richardlehane/msoleps v1.0.6/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg= github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= -github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY= -github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ= github.com/rs/zerolog v1.35.0 h1:VD0ykx7HMiMJytqINBsKcbLS+BJ4WYjz+05us+LRTdI= github.com/rs/zerolog v1.35.0/go.mod h1:EjML9kdfa/RMA7h/6z6pYmq1ykOuA8/mjWaEvGI+jcw= github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= @@ -144,8 +111,6 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/tiendc/go-deepcopy v1.6.0 h1:0UtfV/imoCwlLxVsyfUd4hNHnB3drXsfle+wzSCA5Wo= -github.com/tiendc/go-deepcopy v1.6.0/go.mod h1:toXoeQoUqXOOS/X4sKuiAoSk6elIdqc0pN7MTgOOo2I= github.com/tiendc/go-deepcopy v1.7.2 h1:Ut2yYR7W9tWjTQitganoIue4UGxZwCcJy3orjrrIj44= github.com/tiendc/go-deepcopy v1.7.2/go.mod h1:4bKjNC2r7boYOkD2IOuZpYjmlDdzjbpTRyCx+goBCJQ= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= @@ -160,45 +125,31 @@ github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6 github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= github.com/xuri/efp v0.0.1 h1:fws5Rv3myXyYni8uwj2qKjVaRP30PdjeYe2Y6FDsCL8= github.com/xuri/efp v0.0.1/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI= -github.com/xuri/excelize/v2 v2.9.1 h1:VdSGk+rraGmgLHGFaGG9/9IWu1nj4ufjJ7uwMDtj8Qw= -github.com/xuri/excelize/v2 v2.9.1/go.mod h1:x7L6pKz2dvo9ejrRuD8Lnl98z4JLt0TGAwjhW+EiP8s= github.com/xuri/excelize/v2 v2.10.1 h1:V62UlqopMqha3kOpnlHy2CcRVw1V8E63jFoWUmMzxN0= github.com/xuri/excelize/v2 v2.10.1/go.mod h1:iG5tARpgaEeIhTqt3/fgXCGoBRt4hNXgCp3tfXKoOIc= -github.com/xuri/nfp v0.0.1 h1:MDamSGatIvp8uOmDP8FnmjuQpu90NzdJxo7242ANR9Q= -github.com/xuri/nfp v0.0.1/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ= github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 h1:+C0TIdyyYmzadGaL/HBLbf3WdLgC29pgyhTjAT/0nuE= github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ= github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM= github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.mongodb.org/mongo-driver v1.17.9 h1:IexDdCuuNJ3BHrELgBlyaH9p60JXAvdzWR128q+U5tU= -go.mongodb.org/mongo-driver v1.17.9/go.mod h1:LlOhpH5NUEfhxcAwG0UEkMqwYcc4JU18gtCdGudk/tQ= -go.mongodb.org/mongo-driver/v2 v2.5.0 h1:yXUhImUjjAInNcpTcAlPHiT7bIXhshCTL3jVBkF3xaE= -go.mongodb.org/mongo-driver/v2 v2.5.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0= +go.mongodb.org/mongo-driver/v2 v2.5.1 h1:j2U/Qp+wvueSpqitLCSZPT/+ZpVc1xzuwdHWwl7d8ro= +go.mongodb.org/mongo-driver/v2 v2.5.1/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0= go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y= go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU= -golang.org/x/arch v0.25.0 h1:qnk6Ksugpi5Bz32947rkUgDt9/s5qvqDPl/gBKdMJLE= -golang.org/x/arch v0.25.0/go.mod h1:0X+GdSIP+kL5wPmpK7sdkEVTt2XoYP0cSjQSbZBwOi8= golang.org/x/arch v0.26.0 h1:jZ6dpec5haP/fUv1kLCbuJy6dnRrfX6iVK08lZBFpk4= golang.org/x/arch v0.26.0/go.mod h1:0X+GdSIP+kL5wPmpK7sdkEVTt2XoYP0cSjQSbZBwOi8= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4= -golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA= golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI= golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q= golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.37.0 h1:ZiRjArKI8GwxZOoEtUfhrBtaCN+4b/7709dlT6SSnQA= -golang.org/x/image v0.37.0/go.mod h1:/3f6vaXC+6CEanU4KJxbcUZyEePbyKbaLoDOe4ehFYY= golang.org/x/image v0.39.0 h1:skVYidAEVKgn8lZ602XO75asgXBgLj9G/FE3RbuPFww= golang.org/x/image v0.39.0/go.mod h1:sIbmppfU+xFLPIG0FoVUTvyBMmgng1/XAMhQ2ft0hpA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= -golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA= golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -210,25 +161,16 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= -golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI= golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU= -golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A= golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY= golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8= -golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg= golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/mongoext/pipeline.go b/mongoext/pipeline.go index 3e430d2..5e8f264 100644 --- a/mongoext/pipeline.go +++ b/mongoext/pipeline.go @@ -1,8 +1,8 @@ package mongoext import ( - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/v2/bson" + "go.mongodb.org/mongo-driver/v2/mongo" ) // FixTextSearchPipeline moves {$match:{$text:{$search}}} entries to the front of the pipeline (otherwise its an mongo error) diff --git a/mongoext/projections.go b/mongoext/projections.go index a8b123f..c6abce1 100644 --- a/mongoext/projections.go +++ b/mongoext/projections.go @@ -1,9 +1,10 @@ package mongoext import ( - "go.mongodb.org/mongo-driver/bson" "reflect" "strings" + + "go.mongodb.org/mongo-driver/v2/bson" ) // ProjectionFromStruct automatically generated a mongodb projection for a struct diff --git a/mongoext/registry.go b/mongoext/registry.go index 3ac1f4e..b7bdbf5 100644 --- a/mongoext/registry.go +++ b/mongoext/registry.go @@ -1,51 +1,17 @@ package mongoext import ( - "git.blackforestbytes.com/BlackForestBytes/goext/exerr" - "git.blackforestbytes.com/BlackForestBytes/goext/langext" - "git.blackforestbytes.com/BlackForestBytes/goext/rfctime" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsoncodec" - "go.mongodb.org/mongo-driver/bson/primitive" "reflect" + + "go.mongodb.org/mongo-driver/v2/bson" ) -func CreateGoExtBsonRegistry() *bsoncodec.Registry { +func CreateGoExtBsonRegistry() *bson.Registry { reg := bson.NewRegistry() - reg.RegisterTypeDecoder(reflect.TypeOf(rfctime.RFC3339Time{}), rfctime.RFC3339Time{}) - reg.RegisterTypeDecoder(reflect.TypeOf(&rfctime.RFC3339Time{}), rfctime.RFC3339Time{}) - - reg.RegisterTypeDecoder(reflect.TypeOf(rfctime.RFC3339NanoTime{}), rfctime.RFC3339NanoTime{}) - reg.RegisterTypeDecoder(reflect.TypeOf(&rfctime.RFC3339NanoTime{}), rfctime.RFC3339NanoTime{}) - - reg.RegisterTypeDecoder(reflect.TypeOf(rfctime.UnixTime{}), rfctime.UnixTime{}) - reg.RegisterTypeDecoder(reflect.TypeOf(&rfctime.UnixTime{}), rfctime.UnixTime{}) - - reg.RegisterTypeDecoder(reflect.TypeOf(rfctime.UnixMilliTime{}), rfctime.UnixMilliTime{}) - reg.RegisterTypeDecoder(reflect.TypeOf(&rfctime.UnixMilliTime{}), rfctime.UnixMilliTime{}) - - reg.RegisterTypeDecoder(reflect.TypeOf(rfctime.UnixNanoTime{}), rfctime.UnixNanoTime{}) - reg.RegisterTypeDecoder(reflect.TypeOf(&rfctime.UnixNanoTime{}), rfctime.UnixNanoTime{}) - - reg.RegisterTypeDecoder(reflect.TypeOf(rfctime.Date{}), rfctime.Date{}) - reg.RegisterTypeDecoder(reflect.TypeOf(&rfctime.Date{}), rfctime.Date{}) - - reg.RegisterTypeDecoder(reflect.TypeOf(rfctime.SecondsF64(0)), rfctime.SecondsF64(0)) - reg.RegisterTypeDecoder(reflect.TypeOf(langext.Ptr(rfctime.SecondsF64(0))), rfctime.SecondsF64(0)) - - reg.RegisterTypeDecoder(reflect.TypeOf(exerr.ErrorCategory{}), exerr.ErrorCategory{}) - reg.RegisterTypeDecoder(reflect.TypeOf(langext.Ptr(exerr.ErrorCategory{})), exerr.ErrorCategory{}) - - reg.RegisterTypeDecoder(reflect.TypeOf(exerr.ErrorSeverity{}), exerr.ErrorSeverity{}) - reg.RegisterTypeDecoder(reflect.TypeOf(langext.Ptr(exerr.ErrorSeverity{})), exerr.ErrorSeverity{}) - - reg.RegisterTypeDecoder(reflect.TypeOf(exerr.ErrorType{}), exerr.ErrorType{}) - reg.RegisterTypeDecoder(reflect.TypeOf(langext.Ptr(exerr.ErrorType{})), exerr.ErrorType{}) - - // otherwise we get []primitve.E when unmarshalling into any + // otherwise we get []bson.E when unmarshalling into any // which will result in {'key': .., 'value': ...}[] json when json-marshalling - reg.RegisterTypeMapEntry(bson.TypeEmbeddedDocument, reflect.TypeOf(primitive.M{})) + reg.RegisterTypeMapEntry(bson.TypeEmbeddedDocument, reflect.TypeOf(bson.M{})) return reg } diff --git a/pagination/filter.go b/pagination/filter.go index 93df968..8563c4e 100644 --- a/pagination/filter.go +++ b/pagination/filter.go @@ -2,8 +2,9 @@ package pagination import ( "context" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/mongo" + + "go.mongodb.org/mongo-driver/v2/bson" + "go.mongodb.org/mongo-driver/v2/mongo" ) type MongoFilter interface { diff --git a/reflectext/primStrSer.go b/reflectext/primStrSer.go index 67a3d2d..19efdd3 100644 --- a/reflectext/primStrSer.go +++ b/reflectext/primStrSer.go @@ -3,12 +3,13 @@ package reflectext import ( "errors" "fmt" - "go.mongodb.org/mongo-driver/bson/primitive" - "git.blackforestbytes.com/BlackForestBytes/goext/langext" "reflect" "strconv" "strings" "time" + + "git.blackforestbytes.com/BlackForestBytes/goext/langext" + "go.mongodb.org/mongo-driver/v2/bson" ) var primitiveSerializer = map[reflect.Type]genSerializer{ @@ -28,7 +29,7 @@ var primitiveSerializer = map[reflect.Type]genSerializer{ reflect.TypeOf(true): newGenSerializer(serBoolToString, serStringToBool), - reflect.TypeOf(primitive.ObjectID{}): newGenSerializer(serObjectIDToString, serStringToObjectID), + reflect.TypeOf(bson.ObjectID{}): newGenSerializer(serObjectIDToString, serStringToObjectID), reflect.TypeOf(time.Time{}): newGenSerializer(serTimeToString, serStringToTime), } @@ -111,15 +112,15 @@ func serStringToBool(v string) (bool, error) { return false, errors.New(fmt.Sprintf("invalid boolean value '%s'", v)) } -func serObjectIDToString(v primitive.ObjectID) (string, error) { +func serObjectIDToString(v bson.ObjectID) (string, error) { return v.Hex(), nil } -func serStringToObjectID(v string) (primitive.ObjectID, error) { - if rv, err := primitive.ObjectIDFromHex(v); err == nil { +func serStringToObjectID(v string) (bson.ObjectID, error) { + if rv, err := bson.ObjectIDFromHex(v); err == nil { return rv, nil } else { - return primitive.ObjectID{}, err + return bson.ObjectID{}, err } } diff --git a/rfctime/date.go b/rfctime/date.go index a6e1429..b8b364e 100644 --- a/rfctime/date.go +++ b/rfctime/date.go @@ -4,14 +4,11 @@ import ( "encoding/json" "errors" "fmt" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsoncodec" - "go.mongodb.org/mongo-driver/bson/bsonrw" - "go.mongodb.org/mongo-driver/bson/bsontype" - "reflect" "strconv" "strings" "time" + + "go.mongodb.org/mongo-driver/v2/bson" ) type Date struct { @@ -83,8 +80,8 @@ func (t *Date) UnmarshalText(data []byte) error { return t.ParseString(string(data)) } -func (t *Date) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { - if bt == bsontype.Null { +func (t *Date) UnmarshalBSONValue(bt byte, data []byte) error { + if bson.Type(bt) == bson.TypeNull { // we can't set nil in UnmarshalBSONValue (so we use default(struct)) // Use mongoext.CreateGoExtBsonRegistry if you need to unmarsh pointer values // https://stackoverflow.com/questions/75167597 @@ -92,12 +89,12 @@ func (t *Date) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { *t = Date{} return nil } - if bt != bsontype.String { - return errors.New(fmt.Sprintf("cannot unmarshal %v into Date", bt)) + if bson.Type(bt) != bson.TypeString { + return errors.New(fmt.Sprintf("cannot unmarshal %v into Date", bson.Type(bt))) } var tt string - err := bson.RawValue{Type: bt, Value: data}.Unmarshal(&tt) + err := bson.RawValue{Type: bson.Type(bt), Value: data}.Unmarshal(&tt) if err != nil { return err } @@ -120,43 +117,16 @@ func (t *Date) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { return nil } -func (t Date) MarshalBSONValue() (bsontype.Type, []byte, error) { +func (t Date) MarshalBSONValue() (byte, []byte, error) { + var tp bson.Type + var data []byte + var err error if t.IsZero() { - return bson.MarshalValue("") - } - return bson.MarshalValue(t.String()) -} - -func (t Date) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error { - if val.Kind() == reflect.Ptr && val.IsNil() { - if !val.CanSet() { - return errors.New("ValueUnmarshalerDecodeValue") - } - val.Set(reflect.New(val.Type().Elem())) - } - - tp, src, err := bsonrw.Copier{}.CopyValueToBytes(vr) - if err != nil { - return err - } - - if val.Kind() == reflect.Ptr && len(src) == 0 { - val.Set(reflect.Zero(val.Type())) - return nil - } - - err = t.UnmarshalBSONValue(tp, src) - if err != nil { - return err - } - - if val.Kind() == reflect.Ptr { - val.Set(reflect.ValueOf(&t)) + tp, data, err = bson.MarshalValue("") } else { - val.Set(reflect.ValueOf(t)) + tp, data, err = bson.MarshalValue(t.String()) } - - return nil + return byte(tp), data, err } func (t Date) Serialize() string { diff --git a/rfctime/rfc3339.go b/rfctime/rfc3339.go index 21d95a3..d29172b 100644 --- a/rfctime/rfc3339.go +++ b/rfctime/rfc3339.go @@ -4,14 +4,10 @@ import ( "encoding/json" "errors" "fmt" - "reflect" "time" "git.blackforestbytes.com/BlackForestBytes/goext/langext" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsoncodec" - "go.mongodb.org/mongo-driver/bson/bsonrw" - "go.mongodb.org/mongo-driver/bson/bsontype" + "go.mongodb.org/mongo-driver/v2/bson" ) type RFC3339Time time.Time @@ -70,8 +66,8 @@ func (t *RFC3339Time) UnmarshalText(data []byte) error { return nil } -func (t *RFC3339Time) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { - if bt == bson.TypeNull { +func (t *RFC3339Time) UnmarshalBSONValue(bt byte, data []byte) error { + if bson.Type(bt) == bson.TypeNull { // we can't set nil in UnmarshalBSONValue (so we use default(struct)) // Use mongoext.CreateGoExtBsonRegistry if you need to unmarsh pointer values // https://stackoverflow.com/questions/75167597 @@ -79,11 +75,11 @@ func (t *RFC3339Time) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { *t = RFC3339Time{} return nil } - if bt != bson.TypeDateTime { - return errors.New(fmt.Sprintf("cannot unmarshal %v into RFC3339Time", bt)) + if bson.Type(bt) != bson.TypeDateTime { + return errors.New(fmt.Sprintf("cannot unmarshal %v into RFC3339Time", bson.Type(bt))) } var tt time.Time - err := bson.RawValue{Type: bt, Value: data}.Unmarshal(&tt) + err := bson.RawValue{Type: bson.Type(bt), Value: data}.Unmarshal(&tt) if err != nil { return err } @@ -91,40 +87,9 @@ func (t *RFC3339Time) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { return nil } -func (t RFC3339Time) MarshalBSONValue() (bsontype.Type, []byte, error) { - return bson.MarshalValue(time.Time(t)) -} - -func (t RFC3339Time) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error { - if val.Kind() == reflect.Ptr && val.IsNil() { - if !val.CanSet() { - return errors.New("ValueUnmarshalerDecodeValue") - } - val.Set(reflect.New(val.Type().Elem())) - } - - tp, src, err := bsonrw.Copier{}.CopyValueToBytes(vr) - if err != nil { - return err - } - - if val.Kind() == reflect.Ptr && len(src) == 0 { - val.Set(reflect.Zero(val.Type())) - return nil - } - - err = t.UnmarshalBSONValue(tp, src) - if err != nil { - return err - } - - if val.Kind() == reflect.Ptr { - val.Set(reflect.ValueOf(&t)) - } else { - val.Set(reflect.ValueOf(t)) - } - - return nil +func (t RFC3339Time) MarshalBSONValue() (byte, []byte, error) { + tp, data, err := bson.MarshalValue(time.Time(t)) + return byte(tp), data, err } func (t RFC3339Time) Serialize() string { diff --git a/rfctime/rfc3339Nano.go b/rfctime/rfc3339Nano.go index e0d6c07..b4f40da 100644 --- a/rfctime/rfc3339Nano.go +++ b/rfctime/rfc3339Nano.go @@ -4,13 +4,10 @@ import ( "encoding/json" "errors" "fmt" - "git.blackforestbytes.com/BlackForestBytes/goext/langext" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsoncodec" - "go.mongodb.org/mongo-driver/bson/bsonrw" - "go.mongodb.org/mongo-driver/bson/bsontype" - "reflect" "time" + + "git.blackforestbytes.com/BlackForestBytes/goext/langext" + "go.mongodb.org/mongo-driver/v2/bson" ) type RFC3339NanoTime time.Time @@ -69,8 +66,8 @@ func (t *RFC3339NanoTime) UnmarshalText(data []byte) error { return nil } -func (t *RFC3339NanoTime) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { - if bt == bson.TypeNull { +func (t *RFC3339NanoTime) UnmarshalBSONValue(bt byte, data []byte) error { + if bson.Type(bt) == bson.TypeNull { // we can't set nil in UnmarshalBSONValue (so we use default(struct)) // Use mongoext.CreateGoExtBsonRegistry if you need to unmarsh pointer values // https://stackoverflow.com/questions/75167597 @@ -78,11 +75,11 @@ func (t *RFC3339NanoTime) UnmarshalBSONValue(bt bsontype.Type, data []byte) erro *t = RFC3339NanoTime{} return nil } - if bt != bson.TypeDateTime { - return errors.New(fmt.Sprintf("cannot unmarshal %v into RFC3339NanoTime", bt)) + if bson.Type(bt) != bson.TypeDateTime { + return errors.New(fmt.Sprintf("cannot unmarshal %v into RFC3339NanoTime", bson.Type(bt))) } var tt time.Time - err := bson.RawValue{Type: bt, Value: data}.Unmarshal(&tt) + err := bson.RawValue{Type: bson.Type(bt), Value: data}.Unmarshal(&tt) if err != nil { return err } @@ -90,40 +87,9 @@ func (t *RFC3339NanoTime) UnmarshalBSONValue(bt bsontype.Type, data []byte) erro return nil } -func (t RFC3339NanoTime) MarshalBSONValue() (bsontype.Type, []byte, error) { - return bson.MarshalValue(time.Time(t)) -} - -func (t RFC3339NanoTime) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error { - if val.Kind() == reflect.Ptr && val.IsNil() { - if !val.CanSet() { - return errors.New("ValueUnmarshalerDecodeValue") - } - val.Set(reflect.New(val.Type().Elem())) - } - - tp, src, err := bsonrw.Copier{}.CopyValueToBytes(vr) - if err != nil { - return err - } - - if val.Kind() == reflect.Ptr && len(src) == 0 { - val.Set(reflect.Zero(val.Type())) - return nil - } - - err = t.UnmarshalBSONValue(tp, src) - if err != nil { - return err - } - - if val.Kind() == reflect.Ptr { - val.Set(reflect.ValueOf(&t)) - } else { - val.Set(reflect.ValueOf(t)) - } - - return nil +func (t RFC3339NanoTime) MarshalBSONValue() (byte, []byte, error) { + tp, data, err := bson.MarshalValue(time.Time(t)) + return byte(tp), data, err } func (t RFC3339NanoTime) Serialize() string { diff --git a/rfctime/seconds.go b/rfctime/seconds.go index 076f797..a1ce06b 100644 --- a/rfctime/seconds.go +++ b/rfctime/seconds.go @@ -4,13 +4,10 @@ import ( "encoding/json" "errors" "fmt" - "git.blackforestbytes.com/BlackForestBytes/goext/timeext" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsoncodec" - "go.mongodb.org/mongo-driver/bson/bsonrw" - "go.mongodb.org/mongo-driver/bson/bsontype" - "reflect" "time" + + "git.blackforestbytes.com/BlackForestBytes/goext/timeext" + "go.mongodb.org/mongo-driver/v2/bson" ) type SecondsF64 time.Duration @@ -61,8 +58,8 @@ func (d SecondsF64) MarshalJSON() ([]byte, error) { return json.Marshal(secs) } -func (d *SecondsF64) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { - if bt == bson.TypeNull { +func (d *SecondsF64) UnmarshalBSONValue(bt byte, data []byte) error { + if bson.Type(bt) == bson.TypeNull { // we can't set nil in UnmarshalBSONValue (so we use default(struct)) // Use mongoext.CreateGoExtBsonRegistry if you need to unmarsh pointer values // https://stackoverflow.com/questions/75167597 @@ -70,11 +67,11 @@ func (d *SecondsF64) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { *d = SecondsF64(0) return nil } - if bt != bson.TypeDouble { - return errors.New(fmt.Sprintf("cannot unmarshal %v into SecondsF64", bt)) + if bson.Type(bt) != bson.TypeDouble { + return errors.New(fmt.Sprintf("cannot unmarshal %v into SecondsF64", bson.Type(bt))) } var secValue float64 - err := bson.RawValue{Type: bt, Value: data}.Unmarshal(&secValue) + err := bson.RawValue{Type: bson.Type(bt), Value: data}.Unmarshal(&secValue) if err != nil { return err } @@ -82,40 +79,9 @@ func (d *SecondsF64) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { return nil } -func (d SecondsF64) MarshalBSONValue() (bsontype.Type, []byte, error) { - return bson.MarshalValue(d.Seconds()) -} - -func (d SecondsF64) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error { - if val.Kind() == reflect.Ptr && val.IsNil() { - if !val.CanSet() { - return errors.New("ValueUnmarshalerDecodeValue") - } - val.Set(reflect.New(val.Type().Elem())) - } - - tp, src, err := bsonrw.Copier{}.CopyValueToBytes(vr) - if err != nil { - return err - } - - if val.Kind() == reflect.Ptr && len(src) == 0 { - val.Set(reflect.Zero(val.Type())) - return nil - } - - err = d.UnmarshalBSONValue(tp, src) - if err != nil { - return err - } - - if val.Kind() == reflect.Ptr { - val.Set(reflect.ValueOf(&d)) - } else { - val.Set(reflect.ValueOf(d)) - } - - return nil +func (d SecondsF64) MarshalBSONValue() (byte, []byte, error) { + tp, data, err := bson.MarshalValue(d.Seconds()) + return byte(tp), data, err } func NewSecondsF64(t time.Duration) SecondsF64 { diff --git a/wmo/collection.go b/wmo/collection.go index 7d0c2f8..409f1ed 100644 --- a/wmo/collection.go +++ b/wmo/collection.go @@ -2,16 +2,16 @@ package wmo import ( "context" - "go.mongodb.org/mongo-driver/bson/bsontype" - "go.mongodb.org/mongo-driver/mongo" + "reflect" + ct "git.blackforestbytes.com/BlackForestBytes/goext/cursortoken" "git.blackforestbytes.com/BlackForestBytes/goext/exerr" "git.blackforestbytes.com/BlackForestBytes/goext/langext" - "reflect" + "go.mongodb.org/mongo-driver/v2/mongo" ) type EntityID interface { - MarshalBSONValue() (bsontype.Type, []byte, error) + MarshalBSONValue() (byte, []byte, error) String() string } diff --git a/wmo/decoding.go b/wmo/decoding.go index d2357ff..83b024f 100644 --- a/wmo/decoding.go +++ b/wmo/decoding.go @@ -2,8 +2,9 @@ package wmo import ( "context" - "go.mongodb.org/mongo-driver/bson" + "git.blackforestbytes.com/BlackForestBytes/goext/exerr" + "go.mongodb.org/mongo-driver/v2/bson" ) func (c *Coll[TData]) decodeSingle(ctx context.Context, dec Decodable) (TData, error) { diff --git a/wmo/mongo.go b/wmo/mongo.go index 67c3cd8..1494a9b 100644 --- a/wmo/mongo.go +++ b/wmo/mongo.go @@ -1,6 +1,6 @@ package wmo -import "go.mongodb.org/mongo-driver/mongo" +import "go.mongodb.org/mongo-driver/v2/mongo" func W[TData any](collection *mongo.Collection) *Coll[TData] { c := Coll[TData]{coll: collection} diff --git a/wmo/queryAggregate.go b/wmo/queryAggregate.go index d82e97c..d2a64d8 100644 --- a/wmo/queryAggregate.go +++ b/wmo/queryAggregate.go @@ -2,13 +2,14 @@ package wmo import ( "context" - "go.mongodb.org/mongo-driver/mongo" - "go.mongodb.org/mongo-driver/mongo/options" + "git.blackforestbytes.com/BlackForestBytes/goext/exerr" "git.blackforestbytes.com/BlackForestBytes/goext/langext" + "go.mongodb.org/mongo-driver/v2/mongo" + "go.mongodb.org/mongo-driver/v2/mongo/options" ) -func (c *Coll[TData]) Aggregate(ctx context.Context, pipeline mongo.Pipeline, opts ...*options.AggregateOptions) ([]TData, error) { +func (c *Coll[TData]) Aggregate(ctx context.Context, pipeline mongo.Pipeline, opts ...options.Lister[options.AggregateOptions]) ([]TData, error) { for _, ppl := range c.extraModPipeline { pipeline = langext.ArrConcat(pipeline, ppl(ctx)) @@ -29,7 +30,7 @@ func (c *Coll[TData]) Aggregate(ctx context.Context, pipeline mongo.Pipeline, op return res, nil } -func (c *Coll[TData]) AggregateOneOpt(ctx context.Context, pipeline mongo.Pipeline, opts ...*options.AggregateOptions) (*TData, error) { +func (c *Coll[TData]) AggregateOneOpt(ctx context.Context, pipeline mongo.Pipeline, opts ...options.Lister[options.AggregateOptions]) (*TData, error) { for _, ppl := range c.extraModPipeline { pipeline = langext.ArrConcat(pipeline, ppl(ctx)) @@ -53,7 +54,7 @@ func (c *Coll[TData]) AggregateOneOpt(ctx context.Context, pipeline mongo.Pipeli return nil, nil } -func (c *Coll[TData]) AggregateOne(ctx context.Context, pipeline mongo.Pipeline, opts ...*options.AggregateOptions) (TData, error) { +func (c *Coll[TData]) AggregateOne(ctx context.Context, pipeline mongo.Pipeline, opts ...options.Lister[options.AggregateOptions]) (TData, error) { for _, ppl := range c.extraModPipeline { pipeline = langext.ArrConcat(pipeline, ppl(ctx)) diff --git a/wmo/queryDelete.go b/wmo/queryDelete.go index ce7de70..29ece18 100644 --- a/wmo/queryDelete.go +++ b/wmo/queryDelete.go @@ -2,9 +2,10 @@ package wmo import ( "context" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/mongo" + "git.blackforestbytes.com/BlackForestBytes/goext/exerr" + "go.mongodb.org/mongo-driver/v2/bson" + "go.mongodb.org/mongo-driver/v2/mongo" ) func (c *Coll[TData]) DeleteOneByID(ctx context.Context, id EntityID) error { diff --git a/wmo/queryFind.go b/wmo/queryFind.go index f2046c9..c7aa5d3 100644 --- a/wmo/queryFind.go +++ b/wmo/queryFind.go @@ -2,12 +2,13 @@ package wmo import ( "context" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/mongo" - "go.mongodb.org/mongo-driver/mongo/options" + "iter" + "git.blackforestbytes.com/BlackForestBytes/goext/exerr" "git.blackforestbytes.com/BlackForestBytes/goext/langext" - "iter" + "go.mongodb.org/mongo-driver/v2/bson" + "go.mongodb.org/mongo-driver/v2/mongo" + "go.mongodb.org/mongo-driver/v2/mongo/options" ) func (c *Coll[TData]) createFindQuery(ctx context.Context, filter bson.M, opts ...*options.FindOptions) (*mongo.Cursor, error) { @@ -51,7 +52,7 @@ func (c *Coll[TData]) createFindQuery(ctx context.Context, filter bson.M, opts . } } - convOpts := make([]*options.AggregateOptions, 0, len(opts)) + convOpts := make([]*options.AggregateOptionsBuilder, 0, len(opts)) for _, v := range opts { vConv, err := convertFindOpt(v) if err != nil { @@ -60,7 +61,14 @@ func (c *Coll[TData]) createFindQuery(ctx context.Context, filter bson.M, opts . convOpts = append(convOpts, vConv) } - cursor, err := c.coll.Aggregate(ctx, pipeline, convOpts...) + convOptsLister := make([]options.Lister[options.AggregateOptions], 0, len(convOpts)) + for _, v := range convOpts { + if v != nil { + convOptsLister = append(convOptsLister, v) + } + } + + cursor, err := c.coll.Aggregate(ctx, pipeline, convOptsLister...) if err != nil { return nil, exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipeline).Str("collection", c.Name()).Build() } @@ -137,7 +145,7 @@ func (c *Coll[TData]) FindIterate(ctx context.Context, filter bson.M, opts ...*o } // converts FindOptions to AggregateOptions -func convertFindOpt(v *options.FindOptions) (*options.AggregateOptions, error) { +func convertFindOpt(v *options.FindOptions) (*options.AggregateOptionsBuilder, error) { if v == nil { return nil, nil } @@ -157,7 +165,7 @@ func convertFindOpt(v *options.FindOptions) (*options.AggregateOptions, error) { r.SetCollation(v.Collation) } if v.Comment != nil { - r.SetComment(*v.Comment) + r.SetComment(v.Comment) } if v.CursorType != nil { return nil, exerr.New(exerr.TypeMongoInvalidOpt, "Invalid option 'CursorType' (cannot convert to AggregateOptions)").Build() @@ -171,9 +179,6 @@ func convertFindOpt(v *options.FindOptions) (*options.AggregateOptions, error) { if v.MaxAwaitTime != nil { r.SetMaxAwaitTime(*v.MaxAwaitTime) } - if v.MaxTime != nil { - r.SetMaxTime(*v.MaxTime) - } if v.Min != nil { return nil, exerr.New(exerr.TypeMongoInvalidOpt, "Invalid option 'Min' (cannot convert to AggregateOptions)").Build() } @@ -189,9 +194,6 @@ func convertFindOpt(v *options.FindOptions) (*options.AggregateOptions, error) { if v.ShowRecordID != nil { return nil, exerr.New(exerr.TypeMongoInvalidOpt, "Invalid option 'ShowRecordID' (cannot convert to AggregateOptions)").Build() } - if v.Snapshot != nil { - return nil, exerr.New(exerr.TypeMongoInvalidOpt, "Invalid option 'Snapshot' (cannot convert to AggregateOptions)").Build() - } if v.Let != nil { r.SetLet(v.Let) } diff --git a/wmo/queryFindOne.go b/wmo/queryFindOne.go index 337d216..728f98f 100644 --- a/wmo/queryFindOne.go +++ b/wmo/queryFindOne.go @@ -3,10 +3,11 @@ package wmo import ( "context" "errors" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/mongo" + "git.blackforestbytes.com/BlackForestBytes/goext/exerr" "git.blackforestbytes.com/BlackForestBytes/goext/langext" + "go.mongodb.org/mongo-driver/v2/bson" + "go.mongodb.org/mongo-driver/v2/mongo" ) func (c *Coll[TData]) FindOne(ctx context.Context, filter bson.M) (TData, error) { diff --git a/wmo/queryInsert.go b/wmo/queryInsert.go index 26be43a..173486e 100644 --- a/wmo/queryInsert.go +++ b/wmo/queryInsert.go @@ -2,10 +2,11 @@ package wmo import ( "context" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/mongo" + "git.blackforestbytes.com/BlackForestBytes/goext/exerr" "git.blackforestbytes.com/BlackForestBytes/goext/langext" + "go.mongodb.org/mongo-driver/v2/bson" + "go.mongodb.org/mongo-driver/v2/mongo" ) func (c *Coll[TData]) InsertOne(ctx context.Context, valueIn TData) (TData, error) { diff --git a/wmo/queryList.go b/wmo/queryList.go index 6a07b6c..59f84ec 100644 --- a/wmo/queryList.go +++ b/wmo/queryList.go @@ -2,12 +2,13 @@ package wmo import ( "context" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/mongo" + "iter" + ct "git.blackforestbytes.com/BlackForestBytes/goext/cursortoken" "git.blackforestbytes.com/BlackForestBytes/goext/exerr" "git.blackforestbytes.com/BlackForestBytes/goext/langext" - "iter" + "go.mongodb.org/mongo-driver/v2/bson" + "go.mongodb.org/mongo-driver/v2/mongo" ) func (c *Coll[TData]) List(ctx context.Context, filter ct.Filter, pageSize *int, inTok ct.CursorToken) ([]TData, ct.CursorToken, error) { diff --git a/wmo/queryPaginate.go b/wmo/queryPaginate.go index ac0f552..9965532 100644 --- a/wmo/queryPaginate.go +++ b/wmo/queryPaginate.go @@ -2,12 +2,13 @@ package wmo import ( "context" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/mongo" + "iter" + "git.blackforestbytes.com/BlackForestBytes/goext/exerr" "git.blackforestbytes.com/BlackForestBytes/goext/langext" pag "git.blackforestbytes.com/BlackForestBytes/goext/pagination" - "iter" + "go.mongodb.org/mongo-driver/v2/bson" + "go.mongodb.org/mongo-driver/v2/mongo" ) func (c *Coll[TData]) Paginate(ctx context.Context, filter pag.MongoFilter, page int, limit *int) ([]TData, pag.Pagination, error) { diff --git a/wmo/queryUpdate.go b/wmo/queryUpdate.go index c757633..af89df9 100644 --- a/wmo/queryUpdate.go +++ b/wmo/queryUpdate.go @@ -2,10 +2,11 @@ package wmo import ( "context" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/mongo" - "go.mongodb.org/mongo-driver/mongo/options" + "git.blackforestbytes.com/BlackForestBytes/goext/exerr" + "go.mongodb.org/mongo-driver/v2/bson" + "go.mongodb.org/mongo-driver/v2/mongo" + "go.mongodb.org/mongo-driver/v2/mongo/options" ) func (c *Coll[TData]) FindOneAndUpdate(ctx context.Context, filterQuery bson.M, updateQuery bson.M) (TData, error) { diff --git a/wmo/reflection_test.go b/wmo/reflection_test.go index 889942f..5ebad89 100644 --- a/wmo/reflection_test.go +++ b/wmo/reflection_test.go @@ -10,8 +10,8 @@ import ( "git.blackforestbytes.com/BlackForestBytes/goext/rfctime" "git.blackforestbytes.com/BlackForestBytes/goext/timeext" "git.blackforestbytes.com/BlackForestBytes/goext/tst" - "go.mongodb.org/mongo-driver/bson/primitive" - "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/v2/bson" + "go.mongodb.org/mongo-driver/v2/mongo" ) func TestReflectionGetFieldType(t *testing.T) { @@ -235,12 +235,11 @@ func TestReflectionGetFieldValueAsTokenString(t *testing.T) { func TestReflectionWithInterface(t *testing.T) { type TestData struct { - ID primitive.ObjectID `bson:"_id"` - CDate time.Time `bson:"cdate"` + ID bson.ObjectID `bson:"_id"` + CDate time.Time `bson:"cdate"` } - type TestInterface interface { - } + type TestInterface any coll1 := W[TestInterface](&mongo.Collection{})