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

support reverse m2m relation

Browse Source
This commit is contained in:
slene 2013-11-06 21:08:12 +08:00
parent 2abda0954b
commit 9492e4131b
3 changed files with 78 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
orm/db_utils.go
View File

@ -63,7 +63,7 @@ outFor:
if len(v) > 10 { if len(v) > 10 {
s = v[:10] s = v[:10]
} }
t, err = time.ParseInLocation(format_Date, s, DefaultTimeLoc) t, err = time.ParseInLocation(format_Date, s, tz)
} }
if err == nil { if err == nil {
if fi.fieldType == TypeDateField { if fi.fieldType == TypeDateField {

7
orm/orm.go
View File

@ -119,8 +119,11 @@ func (o *orm) QueryM2M(md interface{}, name string) QueryM2Mer {
mi, ind := o.getMiInd(md) mi, ind := o.getMiInd(md)
fi := o.getFieldInfo(mi, name) fi := o.getFieldInfo(mi, name)
if fi.fieldType != RelManyToMany { switch {
panic(fmt.Errorf("<Ormer.QueryM2M> name `%s` for model `%s` is not a m2m field", fi.name, mi.fullName)) case fi.fieldType == RelManyToMany:
case fi.fieldType == RelReverseMany && fi.reverseFieldInfo.mi.isThrough:
default:
panic(fmt.Errorf("<Ormer.QueryM2M> model `%s` . name `%s` is not a m2m field", fi.name, mi.fullName))
} }
return newQueryM2M(md, o, mi, fi, ind) return newQueryM2M(md, o, mi, fi, ind)

75
orm/orm_test.go
View File

@ -483,9 +483,9 @@ func TestExpr(t *testing.T) {
throwFail(t, err) throwFail(t, err)
throwFail(t, AssertIs(num, 3)) throwFail(t, AssertIs(num, 3))
num, err = qs.Filter("created", time.Now().Format(format_Date)).Count() // num, err = qs.Filter("created", time.Now().Format(format_Date)).Count()
throwFail(t, err) // throwFail(t, err)
throwFail(t, AssertIs(num, 3)) // throwFail(t, AssertIs(num, 3))
} }
func TestOperators(t *testing.T) { func TestOperators(t *testing.T) {
@ -1093,6 +1093,75 @@ func TestQueryM2M(t *testing.T) {
num, err = m2m.Count() num, err = m2m.Count()
throwFailNow(t, err) throwFailNow(t, err)
throwFailNow(t, AssertIs(num, 0)) throwFailNow(t, AssertIs(num, 0))
tag := Tag{Name: "test"}
_, err = dORM.Insert(&tag)
throwFailNow(t, err)
m2m = dORM.QueryM2M(&tag, "Posts")
post1 := []*Post{&Post{Title: "TestPost1"}, &Post{Title: "TestPost2"}}
post2 := &Post{Title: "TestPost3"}
post3 := []interface{}{&Post{Title: "TestPost4"}}
posts := []interface{}{post1[0], post1[1], post2, post3[0]}
for _, post := range posts {
p := post.(*Post)
p.User = &User{Id: 1}
_, err := dORM.Insert(post)
throwFailNow(t, err)
}
num, err = m2m.Add(post1)
throwFailNow(t, err)
throwFailNow(t, AssertIs(num, 2))
num, err = m2m.Add(post2)
throwFailNow(t, err)
throwFailNow(t, AssertIs(num, 1))
num, err = m2m.Add(post3)
throwFailNow(t, err)
throwFailNow(t, AssertIs(num, 1))
num, err = m2m.Count()
throwFailNow(t, err)
throwFailNow(t, AssertIs(num, 4))
num, err = m2m.Remove(post3)
throwFailNow(t, err)
throwFailNow(t, AssertIs(num, 1))
num, err = m2m.Count()
throwFailNow(t, err)
throwFailNow(t, AssertIs(num, 3))
exist = m2m.Exist(post2)
throwFailNow(t, AssertIs(exist, true))
num, err = m2m.Remove(post2)
throwFailNow(t, err)
throwFailNow(t, AssertIs(num, 1))
exist = m2m.Exist(post2)
throwFailNow(t, AssertIs(exist, false))
num, err = m2m.Count()
throwFailNow(t, err)
throwFailNow(t, AssertIs(num, 2))
num, err = m2m.Clear()
throwFailNow(t, err)
throwFailNow(t, AssertIs(num, 2))
num, err = m2m.Count()
throwFailNow(t, err)
throwFailNow(t, AssertIs(num, 0))
num, err = dORM.Delete(&tag)
throwFailNow(t, err)
throwFailNow(t, AssertIs(num, 1))
} }
func TestQueryRelate(t *testing.T) { func TestQueryRelate(t *testing.T) {