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

fix tests

This commit is contained in:
Lunny Xiao 2019-03-14 09:16:53 +08:00
parent ae51ac47b7
commit 854a2778f1
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cache_test.go
View File

@ -62,7 +62,7 @@ func TestCacheFind(t *testing.T) {
idName := mapper.Obj2Table("Id") idName := mapper.Obj2Table("Id")
boxes = make([]MailBox, 0, 2) boxes = make([]MailBox, 0, 2)
assert.NoError(t, testEngine.Alias("a").Where("a."+idName+" > -1").Asc("a."+idName).Find(&boxes)) assert.NoError(t, testEngine.Alias("a").Where("`a`.`"+idName+"` > -1").Asc("a."+idName).Find(&boxes))
assert.EqualValues(t, 2, len(boxes)) assert.EqualValues(t, 2, len(boxes))
for i, box := range boxes { for i, box := range boxes {
assert.Equal(t, inserts[i].Id, box.Id) assert.Equal(t, inserts[i].Id, box.Id)
@ -79,7 +79,7 @@ func TestCacheFind(t *testing.T) {
tableName := mapper.Obj2Table("MailBox") tableName := mapper.Obj2Table("MailBox")
boxes2 := make([]MailBox4, 0, 2) boxes2 := make([]MailBox4, 0, 2)
assert.NoError(t, testEngine.Table(tableName).Where(tableName+"."+idName+" > -1").Asc(tableName+"."+idName).Find(&boxes2)) assert.NoError(t, testEngine.Table(tableName).Where("`"+tableName+"`.`"+idName+"` > -1").Asc(tableName+"."+idName).Find(&boxes2))
assert.EqualValues(t, 2, len(boxes2)) assert.EqualValues(t, 2, len(boxes2))
for i, box := range boxes2 { for i, box := range boxes2 {
assert.Equal(t, inserts[i].Id, box.Id) assert.Equal(t, inserts[i].Id, box.Id)
@ -168,14 +168,14 @@ func TestCacheGet(t *testing.T) {
idName := mapper.Obj2Table("Id") idName := mapper.Obj2Table("Id")
var box1 MailBox3 var box1 MailBox3
has, err := testEngine.Where(idName+" = ?", inserts[0].Id).Get(&box1) has, err := testEngine.Where("`"+idName+"` = ?", inserts[0].Id).Get(&box1)
assert.NoError(t, err) assert.NoError(t, err)
assert.True(t, has) assert.True(t, has)
assert.EqualValues(t, "user1", box1.Username) assert.EqualValues(t, "user1", box1.Username)
assert.EqualValues(t, "pass1", box1.Password) assert.EqualValues(t, "pass1", box1.Password)
var box2 MailBox3 var box2 MailBox3
has, err = testEngine.Where(idName+" = ?", inserts[0].Id).Get(&box2) has, err = testEngine.Where("`"+idName+"` = ?", inserts[0].Id).Get(&box2)
assert.NoError(t, err) assert.NoError(t, err)
assert.True(t, has) assert.True(t, has)
assert.EqualValues(t, "user1", box2.Username) assert.EqualValues(t, "user1", box2.Username)

8
session_cond_test.go
View File

@ -36,8 +36,8 @@ func TestBuilder(t *testing.T) {
_, err = testEngine.Insert(&Condition{TableName: "table1", ColName: "col1", Op: OpEqual, Value: "1"}) _, err = testEngine.Insert(&Condition{TableName: "table1", ColName: "col1", Op: OpEqual, Value: "1"})
assert.NoError(t, err) assert.NoError(t, err)
colNameName := mapper.Obj2Table("ColName") colNameName := "`" + mapper.Obj2Table("ColName") + "`"
opName := mapper.Obj2Table("Op") opName := "`" + mapper.Obj2Table("Op") + "`"
var cond Condition var cond Condition
has, err := testEngine.Where(builder.Eq{colNameName: "col1"}).Get(&cond) has, err := testEngine.Where(builder.Eq{colNameName: "col1"}).Get(&cond)
@ -45,7 +45,7 @@ func TestBuilder(t *testing.T) {
assert.Equal(t, true, has, "records should exist") assert.Equal(t, true, has, "records should exist")
has, err = testEngine.Where(builder.Eq{colNameName: "col1"}. has, err = testEngine.Where(builder.Eq{colNameName: "col1"}.
And(builder.Eq{"op": OpEqual})). And(builder.Eq{opName: OpEqual})).
NoAutoCondition(). NoAutoCondition().
Get(&cond) Get(&cond)
assert.NoError(t, err) assert.NoError(t, err)
@ -223,7 +223,7 @@ func TestFindAndCount(t *testing.T) {
var results []FindAndCount var results []FindAndCount
nameName := mapper.Obj2Table("Name") nameName := mapper.Obj2Table("Name")
sess := testEngine.Where(nameName+" = ?", "test1") sess := testEngine.Where("`"+nameName+"` = ?", "test1")
conds := sess.Conds() conds := sess.Conds()
err = sess.Find(&results) err = sess.Find(&results)
assert.NoError(t, err) assert.NoError(t, err)