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 f603887eb7
commit 0d0f2a8f58
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
6 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cache_test.go
View File

@ -62,7 +62,7 @@ func TestCacheFind(t *testing.T) {
idName := colMapper.Obj2Table("Id")
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))
for i, box := range boxes {
assert.Equal(t, inserts[i].Id, box.Id)
@ -79,7 +79,7 @@ func TestCacheFind(t *testing.T) {
tableName := tableMapper.Obj2Table("MailBox")
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))
for i, box := range boxes2 {
assert.Equal(t, inserts[i].Id, box.Id)
@ -165,17 +165,17 @@ func TestCacheGet(t *testing.T) {
_, err := testEngine.Insert(inserts[0])
assert.NoError(t, err)
idName := mapper.Obj2Table("Id")
idName := colMapper.Obj2Table("Id")
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.True(t, has)
assert.EqualValues(t, "user1", box1.Username)
assert.EqualValues(t, "pass1", box1.Password)
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.True(t, has)
assert.EqualValues(t, "user1", box2.Username)

8
session_cols_test.go
View File

@ -48,7 +48,7 @@ func TestSetExpr(t *testing.T) {
if testEngine.Dialect().DBType() == core.MSSQL {
not = "~"
}
showName := mapper.Obj2Table("Show")
showName := colMapper.Obj2Table("Show")
cnt, err = testEngine.SetExpr(showName, not+" `"+showName+"`").ID(1).Update(new(UserExpr))
assert.NoError(t, err)
assert.EqualValues(t, 1, cnt)
@ -82,8 +82,8 @@ func TestCols(t *testing.T) {
assert.NoError(t, err)
sess := testEngine.ID(1)
col1Name := mapper.Obj2Table("Col1")
col2Name := mapper.Obj2Table("Col2")
col1Name := colMapper.Obj2Table("Col1")
col2Name := colMapper.Obj2Table("Col2")
_, err = sess.Cols(col1Name).Cols(col2Name).Update(&ColsTable{
Col1: "",
Col2: "",
@ -133,7 +133,7 @@ func TestMustCol(t *testing.T) {
}
customer.ParentId = 0
parentIDName := mapper.Obj2Table("ParentId")
parentIDName := colMapper.Obj2Table("ParentId")
affected, err := testEngine.MustCols(parentIDName).Update(&customer, &CustomerOnlyId{Id: customer.Id})
assert.NoError(t, err)
assert.EqualValues(t, 1, affected)

14
session_cond_test.go
View File

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

2
session_exist_test.go
View File

@ -46,7 +46,7 @@ func TestExistStruct(t *testing.T) {
assert.NoError(t, err)
assert.False(t, has)
nameName := mapper.Obj2Table("Name")
nameName := colMapper.Obj2Table("Name")
has, err = testEngine.Where(nameName+" = ?", "test1").Exist(&RecordExist{})
assert.NoError(t, err)

2
session_insert_test.go
View File

@ -494,7 +494,7 @@ func TestDefaultTime3(t *testing.T) {
Cuser: "userId",
Muser: "userId",
}
endTimeName := mapper.Obj2Table("EndTime")
endTimeName := colMapper.Obj2Table("EndTime")
cnt, err := testEngine.Omit(endTimeName).InsertOne(prepareTask)
assert.NoError(t, err)
assert.EqualValues(t, 1, cnt)

4
session_tx_test.go
View File

@ -72,8 +72,8 @@ func TestCombineTransaction(t *testing.T) {
_, err = session.Insert(&user1)
assert.NoError(t, err)
tableName := mapper.Obj2Table("Userinfo")
userName := mapper.Obj2Table("Username")
tableName := tableMapper.Obj2Table("Userinfo")
userName := colMapper.Obj2Table("Username")
user2 := Userinfo{Username: "zzz"}
_, err = session.Where("id = ?", 0).Update(&user2)