From 06f3b40240d317a209a4043e2f4a158b75511c37 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 13 Mar 2019 22:07:37 +0800 Subject: [PATCH] fix bugs --- session_find_test.go | 12 +++++++++--- session_tx_test.go | 5 ++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/session_find_test.go b/session_find_test.go index 2f89ad9b..a29e07c4 100644 --- a/session_find_test.go +++ b/session_find_test.go @@ -54,11 +54,17 @@ func TestJoinLimit(t *testing.T) { assert.EqualValues(t, 1, cnt) tableName := mapper.Obj2Table("CheckList") + tableName2 := mapper.Obj2Table("Salary") + tableName3 := mapper.Obj2Table("Empsetting") + + idName := mapper.Obj2Table("Id") + lIDName := mapper.Obj2Table("Lid") + eIDName := mapper.Obj2Table("Eid") var salaries []Salary - err = testEngine.Table("salary"). - Join("INNER", tableName, tableName+".id = salary.lid"). - Join("LEFT", "empsetting", "empsetting.id = "+tableName+".eid"). + err = testEngine.Table(tableName2). + Join("INNER", tableName, tableName+"."+idName+" = "+tableName2+"."+lIDName). + Join("LEFT", tableName3, tableName3+"."+idName+" = "+tableName+"."+eIDName). Limit(10, 0). Find(&salaries) assert.NoError(t, err) diff --git a/session_tx_test.go b/session_tx_test.go index 23e1bf28..8b4ed5e6 100644 --- a/session_tx_test.go +++ b/session_tx_test.go @@ -73,11 +73,14 @@ func TestCombineTransaction(t *testing.T) { _, err = session.Insert(&user1) assert.NoError(t, err) + tableName := mapper.Obj2Table("Userinfo") + userName := mapper.Obj2Table("Username") + user2 := Userinfo{Username: "zzz"} _, err = session.Where("id = ?", 0).Update(&user2) assert.NoError(t, err) - _, err = session.Exec("delete from "+testEngine.TableName("userinfo", true)+" where username = ?", user2.Username) + _, err = session.Exec("delete from "+testEngine.TableName(tableName, true)+" where "+userName+" = ?", user2.Username) assert.NoError(t, err) err = session.Commit()