From 0d0f2a8f582c8de3e9559f6f86af31121adce33f Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 14 Mar 2019 09:16:53 +0800 Subject: [PATCH] fix tests --- cache_test.go | 10 +++++----- session_cols_test.go | 8 ++++---- session_cond_test.go | 14 +++++--------- session_exist_test.go | 2 +- session_insert_test.go | 2 +- session_tx_test.go | 4 ++-- 6 files changed, 18 insertions(+), 22 deletions(-) diff --git a/cache_test.go b/cache_test.go index 198995f3..27d8db26 100644 --- a/cache_test.go +++ b/cache_test.go @@ -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) diff --git a/session_cols_test.go b/session_cols_test.go index 7628740e..22469b49 100644 --- a/session_cols_test.go +++ b/session_cols_test.go @@ -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) diff --git a/session_cond_test.go b/session_cond_test.go index 2b1ca20a..12ee2c1c 100644 --- a/session_cond_test.go +++ b/session_cond_test.go @@ -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) diff --git a/session_exist_test.go b/session_exist_test.go index 33977e5a..1fa14a99 100644 --- a/session_exist_test.go +++ b/session_exist_test.go @@ -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) diff --git a/session_insert_test.go b/session_insert_test.go index 31395e5f..5a33d830 100644 --- a/session_insert_test.go +++ b/session_insert_test.go @@ -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) diff --git a/session_tx_test.go b/session_tx_test.go index b00991d7..ac126169 100644 --- a/session_tx_test.go +++ b/session_tx_test.go @@ -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)