diff --git a/go.mod b/go.mod index db50a51..5013fa1 100644 --- a/go.mod +++ b/go.mod @@ -3,15 +3,14 @@ module github.com/mainnika/mongox-go-driver require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-stack/stack v1.8.0 // indirect - github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect - github.com/google/go-cmp v0.2.0 // indirect - github.com/mongodb/mongo-go-driver v0.3.0 - github.com/stretchr/objx v0.1.1 // indirect - github.com/stretchr/testify v1.3.0 - github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51 // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/google/go-cmp v0.3.0 // indirect + github.com/stretchr/testify v1.3.0 // indirect + github.com/tidwall/pretty v0.0.0-20190325153808-1166b9ac2b65 // indirect github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect github.com/xdg/stringprep v1.0.0 // indirect - golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67 // indirect - golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect - golang.org/x/text v0.3.0 // indirect + go.mongodb.org/mongo-driver v1.0.1 + golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f // indirect + golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect + golang.org/x/text v0.3.2 // indirect ) diff --git a/go.sum b/go.sum index 9c7f7f5..6d48dcf 100644 --- a/go.sum +++ b/go.sum @@ -1,35 +1,29 @@ 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= -github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/mongodb/mongo-go-driver v0.1.0 h1:LcpPFw0tNumIAakvNrkI9S9wdX0iOxvMLw/+hcAdHaU= -github.com/mongodb/mongo-go-driver v0.1.0/go.mod h1:NK/HWDIIZkaYsnYa0hmtP443T5ELr0KDecmIioVuuyU= -github.com/mongodb/mongo-go-driver v0.3.0 h1:00tKWMrabkVU1e57/TTP4ZBIfhn/wmjlSiRnIM9d0T8= -github.com/mongodb/mongo-go-driver v0.3.0/go.mod h1:NK/HWDIIZkaYsnYa0hmtP443T5ELr0KDecmIioVuuyU= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51 h1:BP2bjP495BBPaBcS5rmqviTfrOkN5rO5ceKAMRZCRFc= -github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk= +github.com/tidwall/pretty v0.0.0-20190325153808-1166b9ac2b65 h1:rQ229MBgvW68s1/g6f1/63TgYwYxfF4E+bi/KC19P8g= +github.com/tidwall/pretty v0.0.0-20190325153808-1166b9ac2b65/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= -github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0= github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67 h1:ng3VDlRp5/DHpSWl02R4rM9I+8M2rhmsuLwAMmkLQWE= -golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +go.mongodb.org/mongo-driver v1.0.1 h1:r2xNB8juGGrZVcIjX2TpY7HUfz+pNYq+GIuC9h6URZg= +go.mongodb.org/mongo-driver v1.0.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f h1:R423Cnkcp5JABoeemiGEPlt9tHXFfw5kvc0yqlxRPWo= +golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/mongox/base/getid.go b/mongox/base/getid.go index 6770403..ede6b76 100644 --- a/mongox/base/getid.go +++ b/mongox/base/getid.go @@ -3,7 +3,7 @@ package base import ( "github.com/mainnika/mongox-go-driver/mongox" "github.com/mainnika/mongox-go-driver/mongox/errors" - "github.com/mongodb/mongo-go-driver/bson/primitive" + "go.mongodb.org/mongo-driver/bson/primitive" ) // GetID returns source document id diff --git a/mongox/base/object.go b/mongox/base/object.go index 131d334..0421e24 100644 --- a/mongox/base/object.go +++ b/mongox/base/object.go @@ -2,7 +2,7 @@ package base import ( "github.com/mainnika/mongox-go-driver/mongox" - "github.com/mongodb/mongo-go-driver/bson/primitive" + "go.mongodb.org/mongo-driver/bson/primitive" ) var _ mongox.BaseObject = &Object{} diff --git a/mongox/base/objectid.go b/mongox/base/objectid.go index 356c540..ca6c82a 100644 --- a/mongox/base/objectid.go +++ b/mongox/base/objectid.go @@ -2,7 +2,7 @@ package base import ( "github.com/mainnika/mongox-go-driver/mongox" - "github.com/mongodb/mongo-go-driver/bson/primitive" + "go.mongodb.org/mongo-driver/bson/primitive" ) var _ mongox.BaseObjectID = &ObjectID{} diff --git a/mongox/base/protection.go b/mongox/base/protection.go index 01c0176..84db1c3 100644 --- a/mongox/base/protection.go +++ b/mongox/base/protection.go @@ -1,7 +1,7 @@ package base import ( - "github.com/mongodb/mongo-go-driver/bson/primitive" + "go.mongodb.org/mongo-driver/bson/primitive" ) // Protection field stores unique document id and version diff --git a/mongox/common.go b/mongox/common.go index 7cb442f..36d99b5 100644 --- a/mongox/common.go +++ b/mongox/common.go @@ -1,7 +1,7 @@ package mongox import ( - "github.com/mongodb/mongo-go-driver/bson/primitive" + "go.mongodb.org/mongo-driver/bson/primitive" ) type Saver interface { diff --git a/mongox/common/count.go b/mongox/common/count.go index 9e789d1..c4206b1 100644 --- a/mongox/common/count.go +++ b/mongox/common/count.go @@ -4,8 +4,8 @@ import ( "github.com/mainnika/mongox-go-driver/mongox" "github.com/mainnika/mongox-go-driver/mongox/errors" "github.com/mainnika/mongox-go-driver/mongox/query" - "github.com/mongodb/mongo-go-driver/mongo" - "github.com/mongodb/mongo-go-driver/mongo/options" + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/mongo/options" ) // Count function counts documents in the database by query @@ -19,7 +19,7 @@ func Count(db *mongox.Database, target interface{}, filters ...interface{}) (int opts.Limit = composed.Limiter() opts.Skip = composed.Skipper() - result, err := collection.Count(db.Context(), composed.M(), opts) + result, err := collection.CountDocuments(db.Context(), composed.M(), opts) if err == mongo.ErrNoDocuments { return 0, errors.NotFoundErrorf("%s", err) } diff --git a/mongox/common/deleteone.go b/mongox/common/deleteone.go index 199ff10..ad33983 100644 --- a/mongox/common/deleteone.go +++ b/mongox/common/deleteone.go @@ -1,14 +1,15 @@ package common import ( + "time" + "github.com/mainnika/mongox-go-driver/mongox" "github.com/mainnika/mongox-go-driver/mongox/base" "github.com/mainnika/mongox-go-driver/mongox/errors" "github.com/mainnika/mongox-go-driver/mongox/query" - "github.com/mongodb/mongo-go-driver/bson/primitive" - "github.com/mongodb/mongo-go-driver/mongo" - "github.com/mongodb/mongo-go-driver/mongo/options" - "time" + "go.mongodb.org/mongo-driver/bson/primitive" + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/mongo/options" ) // DeleteOne removes a document from a database and then returns it into target diff --git a/mongox/common/loadarray.go b/mongox/common/loadarray.go index 5a9f47f..ffcfd3b 100644 --- a/mongox/common/loadarray.go +++ b/mongox/common/loadarray.go @@ -6,7 +6,7 @@ import ( "github.com/mainnika/mongox-go-driver/mongox" "github.com/mainnika/mongox-go-driver/mongox/errors" "github.com/mainnika/mongox-go-driver/mongox/query" - "github.com/mongodb/mongo-go-driver/mongo/options" + "go.mongodb.org/mongo-driver/mongo/options" ) // LoadArray loads an array of documents from the database by query diff --git a/mongox/common/loadmany.go b/mongox/common/loadmany.go index e173b84..aa30c3f 100644 --- a/mongox/common/loadmany.go +++ b/mongox/common/loadmany.go @@ -6,8 +6,8 @@ import ( "github.com/mainnika/mongox-go-driver/mongox" "github.com/mainnika/mongox-go-driver/mongox/errors" "github.com/mainnika/mongox-go-driver/mongox/query" - "github.com/mongodb/mongo-go-driver/mongo" - "github.com/mongodb/mongo-go-driver/mongo/options" + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/mongo/options" ) // ManyLoader is a controller for a database cursor diff --git a/mongox/common/loadone.go b/mongox/common/loadone.go index d2eedb4..ed2942c 100644 --- a/mongox/common/loadone.go +++ b/mongox/common/loadone.go @@ -4,8 +4,8 @@ import ( "github.com/mainnika/mongox-go-driver/mongox" "github.com/mainnika/mongox-go-driver/mongox/errors" "github.com/mainnika/mongox-go-driver/mongox/query" - "github.com/mongodb/mongo-go-driver/mongo" - "github.com/mongodb/mongo-go-driver/mongo/options" + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/mongo/options" ) // LoadOne function loads a first single target document by a query diff --git a/mongox/common/saveone.go b/mongox/common/saveone.go index 20f87d8..6b36aba 100644 --- a/mongox/common/saveone.go +++ b/mongox/common/saveone.go @@ -1,14 +1,15 @@ package common import ( + "time" + "github.com/mainnika/mongox-go-driver/mongox" "github.com/mainnika/mongox-go-driver/mongox/base" "github.com/mainnika/mongox-go-driver/mongox/errors" "github.com/mainnika/mongox-go-driver/mongox/query" - "github.com/mongodb/mongo-go-driver/bson" - "github.com/mongodb/mongo-go-driver/bson/primitive" - "github.com/mongodb/mongo-go-driver/mongo/options" - "time" + "go.mongodb.org/mongo-driver/bson" + "go.mongodb.org/mongo-driver/bson/primitive" + "go.mongodb.org/mongo-driver/mongo/options" ) // SaveOne saves a single source document to the database diff --git a/mongox/database.go b/mongox/database.go index 9f0362f..ec66b61 100644 --- a/mongox/database.go +++ b/mongox/database.go @@ -5,7 +5,7 @@ import ( "reflect" "github.com/mainnika/mongox-go-driver/mongox/errors" - "github.com/mongodb/mongo-go-driver/mongo" + "go.mongodb.org/mongo-driver/mongo" ) // Database handler diff --git a/mongox/query/compose.go b/mongox/query/compose.go index 9fd1a76..859866e 100644 --- a/mongox/query/compose.go +++ b/mongox/query/compose.go @@ -3,8 +3,8 @@ package query import ( "github.com/mainnika/mongox-go-driver/mongox/base" "github.com/mainnika/mongox-go-driver/mongox/errors" - "github.com/mongodb/mongo-go-driver/bson" - "github.com/mongodb/mongo-go-driver/bson/primitive" + "go.mongodb.org/mongo-driver/bson" + "go.mongodb.org/mongo-driver/bson/primitive" ) // ComposeQuery is a function to compose filters into a single query diff --git a/mongox/query/query.go b/mongox/query/query.go index c17c4b9..8438bdc 100644 --- a/mongox/query/query.go +++ b/mongox/query/query.go @@ -1,7 +1,7 @@ package query import ( - "github.com/mongodb/mongo-go-driver/bson" + "go.mongodb.org/mongo-driver/bson" "reflect" ) diff --git a/mongox/query/sort.go b/mongox/query/sort.go index 1be7281..80129bd 100644 --- a/mongox/query/sort.go +++ b/mongox/query/sort.go @@ -1,7 +1,7 @@ package query import ( - "github.com/mongodb/mongo-go-driver/bson" + "go.mongodb.org/mongo-driver/bson" ) // Sorter is a filter to sort the data before query