Update mongo driver backend to v1.0.1

This commit is contained in:
Nikita Tokarchuk
2019-05-15 14:42:17 +02:00
parent cf7d11daae
commit b2cb450b24
17 changed files with 56 additions and 61 deletions
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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{}
+1 -1
View File
@@ -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{}
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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 {
+3 -3
View File
@@ -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)
}
+5 -4
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+5 -4
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -1,7 +1,7 @@
package query
import (
"github.com/mongodb/mongo-go-driver/bson"
"go.mongodb.org/mongo-driver/bson"
"reflect"
)
+1 -1
View File
@@ -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