Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
6834a79601
|
|||
|
336dea8147
|
|||
|
f8f8cb2366
|
7
mgo.go
7
mgo.go
@@ -2,7 +2,6 @@ package mgocrud
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
|
||||||
"runtime"
|
"runtime"
|
||||||
|
|
||||||
mgo "gopkg.in/mgo.v2"
|
mgo "gopkg.in/mgo.v2"
|
||||||
@@ -14,7 +13,6 @@ type MgoConnection struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func NewMgoConnection(dial string) (Connection, error) {
|
func NewMgoConnection(dial string) (Connection, error) {
|
||||||
fmt.Println("CONNECTION CREATE")
|
|
||||||
connection, err := mgo.Dial(dial)
|
connection, err := mgo.Dial(dial)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -22,7 +20,6 @@ func NewMgoConnection(dial string) (Connection, error) {
|
|||||||
connection.SetMode(mgo.Monotonic, true)
|
connection.SetMode(mgo.Monotonic, true)
|
||||||
c := &MgoConnection{connection: connection}
|
c := &MgoConnection{connection: connection}
|
||||||
runtime.SetFinalizer(c, func(c *MgoConnection) {
|
runtime.SetFinalizer(c, func(c *MgoConnection) {
|
||||||
fmt.Println("CONNECTION CLOSE FINALIZER")
|
|
||||||
if !c.closed {
|
if !c.closed {
|
||||||
c.Close()
|
c.Close()
|
||||||
}
|
}
|
||||||
@@ -31,7 +28,6 @@ func NewMgoConnection(dial string) (Connection, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c *MgoConnection) Close() {
|
func (c *MgoConnection) Close() {
|
||||||
fmt.Println("CONNECTION CLOSE MANUALLY")
|
|
||||||
if !c.closed {
|
if !c.closed {
|
||||||
c.connection.Close()
|
c.connection.Close()
|
||||||
c.closed = true
|
c.closed = true
|
||||||
@@ -45,7 +41,6 @@ type MgoSession struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *MgoSession) Close() {
|
func (s *MgoSession) Close() {
|
||||||
fmt.Println("SESSION CLOSE MANUALLY")
|
|
||||||
if !s.closed {
|
if !s.closed {
|
||||||
s.session.Close()
|
s.session.Close()
|
||||||
s.closed = true
|
s.closed = true
|
||||||
@@ -54,10 +49,8 @@ func (s *MgoSession) Close() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c *MgoConnection) NewSession() Session {
|
func (c *MgoConnection) NewSession() Session {
|
||||||
fmt.Println("SESSION CREATE")
|
|
||||||
s := &MgoSession{session: c.connection.Copy()}
|
s := &MgoSession{session: c.connection.Copy()}
|
||||||
runtime.SetFinalizer(s, func(s *MgoSession) {
|
runtime.SetFinalizer(s, func(s *MgoSession) {
|
||||||
fmt.Println("SESSION CLOSE FINALIZER")
|
|
||||||
if !s.closed {
|
if !s.closed {
|
||||||
s.Close()
|
s.Close()
|
||||||
}
|
}
|
||||||
|
|||||||
14
setup.go
14
setup.go
@@ -9,10 +9,22 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// EnsureIndex ensured mongodb index reflecting model struct index tag
|
// EnsureIndex ensured mongodb index reflecting model struct index tag
|
||||||
func (db *MgoDatabase) EnsureIndex(m ModelInterface) error {
|
func (db *MgoDatabase) EnsureIndex(m ModelInterface, index ...Index) error {
|
||||||
colName := GetCollectionName(m)
|
colName := GetCollectionName(m)
|
||||||
col := db.C(colName)
|
col := db.C(colName)
|
||||||
|
|
||||||
|
if len(index) > 0 {
|
||||||
|
// only ensure given index
|
||||||
|
for _, i := range index {
|
||||||
|
err := col.EnsureIndex(i)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ensure index by struct fields
|
||||||
mType := reflect.TypeOf(m)
|
mType := reflect.TypeOf(m)
|
||||||
|
|
||||||
textFields := []string{}
|
textFields := []string{}
|
||||||
|
|||||||
5
types.go
5
types.go
@@ -22,10 +22,9 @@ type Session interface {
|
|||||||
|
|
||||||
type Database interface {
|
type Database interface {
|
||||||
Session() Session
|
Session() Session
|
||||||
C(name string) Collection
|
// C(name string) Collection
|
||||||
Name() string
|
Name() string
|
||||||
EnsureIndex(m ModelInterface) error
|
EnsureIndex(m ModelInterface, index ...Index) error
|
||||||
ValidateObject(m ModelInterface, changes bson.M) error
|
|
||||||
ReadDocument(m ModelInterface, selector bson.M) error
|
ReadDocument(m ModelInterface, selector bson.M) error
|
||||||
CreateDocument(m ModelInterface) error
|
CreateDocument(m ModelInterface) error
|
||||||
ReadCollection(results interface{}, filter bson.M, selector bson.M, offset int, limit int, sort []string, pipelineModifier PipelineModifierFunction) error
|
ReadCollection(results interface{}, filter bson.M, selector bson.M, offset int, limit int, sort []string, pipelineModifier PipelineModifierFunction) error
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// ValidateObject validates object via validator tag and custom method
|
// ValidateObject validates object via validator tag and custom method
|
||||||
func (db *MgoDatabase) ValidateObject(m ModelInterface, changes bson.M) error {
|
func ValidateObject(db Database, m ModelInterface, changes bson.M) error {
|
||||||
// first validate via struct tag
|
// first validate via struct tag
|
||||||
validator := validator.New(&validator.Config{
|
validator := validator.New(&validator.Config{
|
||||||
TagName: "validator",
|
TagName: "validator",
|
||||||
|
|||||||
Reference in New Issue
Block a user