HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix test

This commit is contained in:
Lunny Xiao 2020-02-24 23:06:35 +08:00
parent 381a45d38a
commit dd8dc7dd2c
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
session_cond_test.go
View File

@ -137,13 +137,13 @@ func TestIn(t *testing.T) {
idsStr = idsStr[:len(idsStr)-1] idsStr = idsStr[:len(idsStr)-1]
users := make([]Userinfo, 0) users := make([]Userinfo, 0)
err = testEngine.In("uid", ids[0], ids[1], ids[2]).Find(&users) err = testEngine.In("id", ids[0], ids[1], ids[2]).Find(&users)
assert.NoError(t, err) assert.NoError(t, err)
fmt.Println(users) fmt.Println(users)
assert.EqualValues(t, 3, len(users)) assert.EqualValues(t, 3, len(users))
users = make([]Userinfo, 0) users = make([]Userinfo, 0)
err = testEngine.In("uid", ids).Find(&users) err = testEngine.In("id", ids).Find(&users)
assert.NoError(t, err) assert.NoError(t, err)
fmt.Println(users) fmt.Println(users)
assert.EqualValues(t, 3, len(users)) assert.EqualValues(t, 3, len(users))
@ -161,7 +161,7 @@ func TestIn(t *testing.T) {
idsInterface = append(idsInterface, id) idsInterface = append(idsInterface, id)
} }
err = testEngine.Where(department+" = ?", "dev").In("uid", idsInterface...).Find(&users) err = testEngine.Where(department+" = ?", "dev").In("id", idsInterface...).Find(&users)
assert.NoError(t, err) assert.NoError(t, err)
fmt.Println(users) fmt.Println(users)
assert.EqualValues(t, 3, len(users)) assert.EqualValues(t, 3, len(users))
@ -175,11 +175,11 @@ func TestIn(t *testing.T) {
dev := testEngine.GetColumnMapper().Obj2Table("Dev") dev := testEngine.GetColumnMapper().Obj2Table("Dev")
err = testEngine.In("uid", 1).In("uid", 2).In(department, dev).Find(&users) err = testEngine.In("id", 1).In("id", 2).In(department, dev).Find(&users)
assert.NoError(t, err) assert.NoError(t, err)
fmt.Println(users) fmt.Println(users)
cnt, err = testEngine.In("uid", ids[0]).Update(&Userinfo{Departname: "dev-"}) cnt, err = testEngine.In("id", ids[0]).Update(&Userinfo{Departname: "dev-"})
assert.NoError(t, err) assert.NoError(t, err)
assert.EqualValues(t, 1, cnt) assert.EqualValues(t, 1, cnt)
@ -189,11 +189,11 @@ func TestIn(t *testing.T) {
assert.True(t, has) assert.True(t, has)
assert.EqualValues(t, "dev-", user.Departname) assert.EqualValues(t, "dev-", user.Departname)
cnt, err = testEngine.In("uid", ids[0]).Update(&Userinfo{Departname: "dev"}) cnt, err = testEngine.In("id", ids[0]).Update(&Userinfo{Departname: "dev"})
assert.NoError(t, err) assert.NoError(t, err)
assert.EqualValues(t, 1, cnt) assert.EqualValues(t, 1, cnt)
cnt, err = testEngine.In("uid", ids[1]).Delete(&Userinfo{}) cnt, err = testEngine.In("id", ids[1]).Delete(&Userinfo{})
assert.NoError(t, err) assert.NoError(t, err)
assert.EqualValues(t, 1, cnt) assert.EqualValues(t, 1, cnt)
} }

8
session_find_test.go
View File

@ -77,14 +77,14 @@ func TestWhere(t *testing.T) {
assertSync(t, new(Userinfo)) assertSync(t, new(Userinfo))
users := make([]Userinfo, 0) users := make([]Userinfo, 0)
err := testEngine.Where("uid > ?", 2).Find(&users) err := testEngine.Where("id > ?", 2).Find(&users)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
panic(err) panic(err)
} }
fmt.Println(users) fmt.Println(users)
err = testEngine.Where("uid > ?", 2).And("uid < ?", 10).Find(&users) err = testEngine.Where("id > ?", 2).And("id < ?", 10).Find(&users)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
panic(err) panic(err)
@ -312,12 +312,12 @@ func TestOrderSameMapper(t *testing.T) {
assertSync(t, new(Userinfo)) assertSync(t, new(Userinfo))
users := make([]Userinfo, 0) users := make([]Userinfo, 0)
err := testEngine.OrderBy("Uid desc").Find(&users) err := testEngine.OrderBy("id desc").Find(&users)
assert.NoError(t, err) assert.NoError(t, err)
fmt.Println(users) fmt.Println(users)
users2 := make([]Userinfo, 0) users2 := make([]Userinfo, 0)
err = testEngine.Asc("Uid", "Username").Desc("Height").Find(&users2) err = testEngine.Asc("id", "Username").Desc("Height").Find(&users2)
assert.NoError(t, err) assert.NoError(t, err)
fmt.Println(users2) fmt.Println(users2)
} }

15
session_tx_test.go
View File

@ -17,15 +17,12 @@ func TestTransaction(t *testing.T) {
assert.NoError(t, prepareEngine()) assert.NoError(t, prepareEngine())
assertSync(t, new(Userinfo)) assertSync(t, new(Userinfo))
counter := func() { counter := func(t *testing.T) {
total, err := testEngine.Count(&Userinfo{}) _, err := testEngine.Count(&Userinfo{})
if err != nil { assert.NoError(t, err)
t.Error(err)
}
fmt.Printf("----now total %v records\n", total)
} }
counter() counter(t)
//defer counter() //defer counter()
session := testEngine.NewSession() session := testEngine.NewSession()
@ -39,7 +36,7 @@ func TestTransaction(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
user2 := Userinfo{Username: "yyy"} user2 := Userinfo{Username: "yyy"}
_, err = session.Where("uid = ?", 0).Update(&user2) _, err = session.Where("id = ?", 0).Update(&user2)
assert.NoError(t, err) assert.NoError(t, err)
_, err = session.Delete(&user2) _, err = session.Delete(&user2)
@ -119,7 +116,7 @@ func TestCombineTransactionSameMapper(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
user2 := Userinfo{Username: "zzz"} user2 := Userinfo{Username: "zzz"}
_, err = session.Where("uid = ?", 0).Update(&user2) _, err = session.Where("id = ?", 0).Update(&user2)
assert.NoError(t, err) assert.NoError(t, err)
_, err = session.Exec("delete from "+testEngine.TableName("`Userinfo`", true)+" where `Username` = ?", user2.Username) _, err = session.Exec("delete from "+testEngine.TableName("`Userinfo`", true)+" where `Username` = ?", user2.Username)