lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-26 10:01:28 +00:00
Code Issues Releases Activity

Merge pull request #1 from gobenon/gobenon-m2mpatch-1

Browse Source 
Update orm_querym2m.go
This commit is contained in:
gobenon 2015-11-19 14:32:24 +02:00
commit 01aa1085e0
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
orm/orm_querym2m.go
View File

@ -44,7 +44,15 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) {
dbase := orm.alias.DbBaser dbase := orm.alias.DbBaser
var models []interface{} var models []interface{}
last_md_col_name := mi.fields.dbcols[len(mi.fields.dbcols)-1]
last_md := mds[len(mds)-1]
var v3 interface{}
var names []string
var values []interface{}
if reflect.Indirect(reflect.ValueOf(last_md)).Kind() != reflect.Struct {
v3 = (last_md)
mds = mds[:len(mds)-1]
}
for _, md := range mds { for _, md := range mds {
val := reflect.ValueOf(md) val := reflect.ValueOf(md)
if val.Kind() == reflect.Slice || val.Kind() == reflect.Array { if val.Kind() == reflect.Slice || val.Kind() == reflect.Array {
@ -63,15 +71,18 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) {
if exist == false { if exist == false {
panic(ErrMissPK) panic(ErrMissPK)
} }
if v3 != nil {
names = []string{mfi.column, rfi.column, last_md_col_name}
names := []string{mfi.column, rfi.column} values = make([]interface{}, 0, len(models)*3)
} else {
values := make([]interface{}, 0, len(models)*2) names = []string{mfi.column, rfi.column}
values = make([]interface{}, 0, len(models)*2)
}
for _, md := range models { for _, md := range models {
ind := reflect.Indirect(reflect.ValueOf(md)) ind := reflect.Indirect(reflect.ValueOf(md))
var v2 interface{} var v2 interface{}
if ind.Kind() != reflect.Struct { if ind.Kind() != reflect.Struct {
v2 = ind.Interface() v2 = ind.Interface()
@ -81,14 +92,17 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) {
panic(ErrMissPK) panic(ErrMissPK)
} }
} }
if v3 == nil {
values = append(values, v1, v2) values = append(values, v1, v2)
} else {
values = append(values, v1, v2, v3)
}
} }
return dbase.InsertValue(orm.db, mi, true, names, values) return dbase.InsertValue(orm.db, mi, true, names, values)
} }
// remove models following the origin model relationship // remove models following the origin model relationship
func (o *queryM2M) Remove(mds ...interface{}) (int64, error) { func (o *queryM2M) Remove(mds ...interface{}) (int64, error) {
fi := o.fi fi := o.fi