Skip to content
This repository was archived by the owner on Sep 7, 2021. It is now read-only.
This repository is currently being migrated. It's locked while the migration is in progress.

Commit 4da260a

Browse files
lunnylunny
committed
fix tests
1 parent f992793 commit 4da260a

15 files changed

+313
-183
lines changed

‎.circleci/config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ jobs:
4949

5050
- run: go test -v -race -db="mysql" -conn_str="root:@/xorm_test" -coverprofile=coverage2-1.txt -covermode=atomic
5151
- run: go test -v -race -db="mysql" -conn_str="root:@/xorm_test" -cache=true -coverprofile=coverage2-2.txt -covermode=atomic
52-
- run: go test -v -race -db="mysql" -conn_str="root:@/xorm_test" -map_type=same -coverprofile=coverage2-1.txt -covermode=atomic
53-
- run: go test -v -race -db="mysql" -conn_str="root:@/xorm_test" -map_type=same -cache=true -coverprofile=coverage2-2.txt -covermode=atomic
52+
- run: go test -v -race -db="mysql" -conn_str="root:@/xorm_test" -map_type=same -coverprofile=coverage2-3.txt -covermode=atomic
53+
- run: go test -v -race -db="mysql" -conn_str="root:@/xorm_test" -map_type=same -cache=true -coverprofile=coverage2-4.txt -covermode=atomic
5454

5555
- run: go test -v -race -db="mymysql" -conn_str="xorm_test/root/" -coverprofile=coverage3-1.txt -covermode=atomic
5656
- run: go test -v -race -db="mymysql" -conn_str="xorm_test/root/" -cache=true -coverprofile=coverage3-2.txt -covermode=atomic
@@ -62,6 +62,6 @@ jobs:
6262
- run: go test -v -race -db="mssql" -conn_str="server=localhost;user id=sa;password=yourStrong(!)Password;database=xorm_test" -cache=true -coverprofile=coverage6-2.txt -covermode=atomic
6363
- run: go test -v -race -db="mysql" -conn_str="root:@tcp(localhost:4000)/xorm_test" -ignore_select_update=true -coverprofile=coverage7-1.txt -covermode=atomic
6464
- run: go test -v -race -db="mysql" -conn_str="root:@tcp(localhost:4000)/xorm_test" -ignore_select_update=true -cache=true -coverprofile=coverage7-2.txt -covermode=atomic
65-
- run: gocovmerge coverage1-1.txt coverage1-2.txt coverage2-1.txt coverage2-2.txt coverage3-1.txt coverage3-2.txt coverage4-1.txt coverage4-2.txt coverage5-1.txt coverage5-2.txt coverage6-1.txt coverage6-2.txt coverage7-1.txt coverage7-2.txt > coverage.txt
65+
- run: gocovmerge coverage1-1.txt coverage1-2.txt coverage1-3.txt coverage1-4.txt coverage2-1.txt coverage2-2.txt coverage2-3.txt coverage2-4.txt coverage3-1.txt coverage3-2.txt coverage4-1.txt coverage4-2.txt coverage5-1.txt coverage5-2.txt coverage6-1.txt coverage6-2.txt coverage7-1.txt coverage7-2.txt > coverage.txt
6666

6767
- run: bash <(curl -s https://codecov.io/bash)

‎cache_test.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ func TestCacheFind(t *testing.T) {
5959
assert.Equal(t, inserts[i].Password, box.Password)
6060
}
6161

62+
idName := mapper.Obj2Table("Id")
63+
6264
boxes = make([]MailBox, 0, 2)
63-
assert.NoError(t, testEngine.Alias("a").Where("a.id > -1").Asc("a.id").Find(&boxes))
65+
assert.NoError(t, testEngine.Alias("a").Where("a."+idName+" > -1").Asc("a."+idName).Find(&boxes))
6466
assert.EqualValues(t, 2, len(boxes))
6567
for i, box := range boxes {
6668
assert.Equal(t, inserts[i].Id, box.Id)
@@ -74,8 +76,10 @@ func TestCacheFind(t *testing.T) {
7476
Password string
7577
}
7678

79+
tableName := mapper.Obj2Table("MailBox")
80+
7781
boxes2 := make([]MailBox4, 0, 2)
78-
assert.NoError(t, testEngine.Table("mail_box").Where("mail_box.id > -1").Asc("mail_box.id").Find(&boxes2))
82+
assert.NoError(t, testEngine.Table(tableName).Where(tableName+"."+idName+" > -1").Asc(tableName+"."+idName).Find(&boxes2))
7983
assert.EqualValues(t, 2, len(boxes2))
8084
for i, box := range boxes2 {
8185
assert.Equal(t, inserts[i].Id, box.Id)

‎session_cond_test.go‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,63 +36,65 @@ func TestBuilder(t *testing.T) {
3636
_, err = testEngine.Insert(&Condition{TableName: "table1", ColName: "col1", Op: OpEqual, Value: "1"})
3737
assert.NoError(t, err)
3838

39+
colNameName := mapper.Obj2Table("ColName")
40+
3941
var cond Condition
40-
has, err := testEngine.Where(builder.Eq{"col_name": "col1"}).Get(&cond)
42+
has, err := testEngine.Where(builder.Eq{colNameName: "col1"}).Get(&cond)
4143
assert.NoError(t, err)
4244
assert.Equal(t, true, has, "records should exist")
4345

44-
has, err = testEngine.Where(builder.Eq{"col_name": "col1"}.
46+
has, err = testEngine.Where(builder.Eq{colNameName: "col1"}.
4547
And(builder.Eq{"op": OpEqual})).
4648
NoAutoCondition().
4749
Get(&cond)
4850
assert.NoError(t, err)
4951
assert.Equal(t, true, has, "records should exist")
5052

51-
has, err = testEngine.Where(builder.Eq{"col_name": "col1", "op": OpEqual, "value": "1"}).
53+
has, err = testEngine.Where(builder.Eq{colNameName: "col1", "op": OpEqual, "value": "1"}).
5254
NoAutoCondition().
5355
Get(&cond)
5456
assert.NoError(t, err)
5557
assert.Equal(t, true, has, "records should exist")
5658

57-
has, err = testEngine.Where(builder.Eq{"col_name": "col1"}.
59+
has, err = testEngine.Where(builder.Eq{colNameName: "col1"}.
5860
And(builder.Neq{"op": OpEqual})).
5961
NoAutoCondition().
6062
Get(&cond)
6163
assert.NoError(t, err)
6264
assert.Equal(t, false, has, "records should not exist")
6365

6466
var conds []Condition
65-
err = testEngine.Where(builder.Eq{"col_name": "col1"}.
67+
err = testEngine.Where(builder.Eq{colNameName: "col1"}.
6668
And(builder.Eq{"op": OpEqual})).
6769
Find(&conds)
6870
assert.NoError(t, err)
6971
assert.EqualValues(t, 1, len(conds), "records should exist")
7072

7173
conds = make([]Condition, 0)
72-
err = testEngine.Where(builder.Like{"col_name", "col"}).Find(&conds)
74+
err = testEngine.Where(builder.Like{colNameName, "col"}).Find(&conds)
7375
assert.NoError(t, err)
7476
assert.EqualValues(t, 1, len(conds), "records should exist")
7577

7678
conds = make([]Condition, 0)
77-
err = testEngine.Where(builder.Expr("col_name = ?", "col1")).Find(&conds)
79+
err = testEngine.Where(builder.Expr(colNameName+" = ?", "col1")).Find(&conds)
7880
assert.NoError(t, err)
7981
assert.EqualValues(t, 1, len(conds), "records should exist")
8082

8183
conds = make([]Condition, 0)
82-
err = testEngine.Where(builder.In("col_name", "col1", "col2")).Find(&conds)
84+
err = testEngine.Where(builder.In(colNameName, "col1", "col2")).Find(&conds)
8385
assert.NoError(t, err)
8486
assert.EqualValues(t, 1, len(conds), "records should exist")
8587

8688
conds = make([]Condition, 0)
87-
err = testEngine.NotIn("col_name", "col1", "col2").Find(&conds)
89+
err = testEngine.NotIn(colNameName, "col1", "col2").Find(&conds)
8890
assert.NoError(t, err)
8991
assert.EqualValues(t, 0, len(conds), "records should not exist")
9092

9193
// complex condtions
9294
var where = builder.NewCond()
9395
if true {
94-
where = where.And(builder.Eq{"col_name": "col1"})
95-
where = where.Or(builder.And(builder.In("col_name", "col1", "col2"), builder.Expr("col_name = ?", "col1")))
96+
where = where.And(builder.Eq{colNameName: "col1"})
97+
where = where.Or(builder.And(builder.In(colNameName, "col1", "col2"), builder.Expr(colNameName+" = ?", "col1")))
9698
}
9799

98100
conds = make([]Condition, 0)

‎session_exist_test.go‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,23 +54,25 @@ func TestExistStruct(t *testing.T) {
5454
assert.NoError(t, err)
5555
assert.False(t, has)
5656

57-
has, err = testEngine.SQL("select * from "+testEngine.TableName("record_exist", true)+" where name = ?", "test1").Exist()
57+
tableName := mapper.Obj2Table("RecordExist")
58+
59+
has, err = testEngine.SQL("select * from "+testEngine.TableName(tableName, true)+" where name = ?", "test1").Exist()
5860
assert.NoError(t, err)
5961
assert.True(t, has)
6062

61-
has, err = testEngine.SQL("select * from "+testEngine.TableName("record_exist", true)+" where name = ?", "test2").Exist()
63+
has, err = testEngine.SQL("select * from "+testEngine.TableName(tableName, true)+" where name = ?", "test2").Exist()
6264
assert.NoError(t, err)
6365
assert.False(t, has)
6466

65-
has, err = testEngine.Table("record_exist").Exist()
67+
has, err = testEngine.Table(tableName).Exist()
6668
assert.NoError(t, err)
6769
assert.True(t, has)
6870

69-
has, err = testEngine.Table("record_exist").Where("name = ?", "test1").Exist()
71+
has, err = testEngine.Table(tableName).Where("name = ?", "test1").Exist()
7072
assert.NoError(t, err)
7173
assert.True(t, has)
7274

73-
has, err = testEngine.Table("record_exist").Where("name = ?", "test2").Exist()
75+
has, err = testEngine.Table(tableName).Where("name = ?", "test2").Exist()
7476
assert.NoError(t, err)
7577
assert.False(t, has)
7678
}

‎session_find_test.go‎

Lines changed: 51 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,12 @@ func TestJoinLimit(t *testing.T) {
5353
assert.NoError(t, err)
5454
assert.EqualValues(t, 1, cnt)
5555

56+
tableName := mapper.Obj2Table("CheckList")
57+
5658
var salaries []Salary
5759
err = testEngine.Table("salary").
58-
Join("INNER", "check_list", "check_list.id = salary.lid").
59-
Join("LEFT", "empsetting", "empsetting.id = check_list.eid").
60+
Join("INNER", tableName, tableName+".id = salary.lid").
61+
Join("LEFT", "empsetting", "empsetting.id = "+tableName+".eid").
6062
Limit(10, 0).
6163
Find(&salaries)
6264
assert.NoError(t, err)
@@ -133,7 +135,7 @@ type TeamUser struct {
133135
}
134136

135137
func (TeamUser) TableName() string {
136-
return "team_user"
138+
return mapper.Obj2Table("TeamUser")
137139
}
138140

139141
func TestFind3(t *testing.T) {
@@ -142,51 +144,58 @@ func TestFind3(t *testing.T) {
142144
err := testEngine.Sync2(new(Team), teamUser)
143145
assert.NoError(t, err)
144146

147+
tableName := mapper.Obj2Table("TeamUser")
148+
teamTableName := mapper.Obj2Table("Team")
149+
idName := mapper.Obj2Table("Id")
150+
orgIDName := mapper.Obj2Table("OrgId")
151+
uidName := mapper.Obj2Table("Uid")
152+
teamIDName := mapper.Obj2Table("TeamId")
153+
145154
var teams []Team
146-
err = testEngine.Cols("`team`.id").
147-
Where("`team_user`.org_id=?", 1).
148-
And("`team_user`.uid=?", 2).
149-
Join("INNER", "`team_user`", "`team_user`.team_id=`team`.id").
155+
err = testEngine.Cols("`"+teamTableName+"`."+idName).
156+
Where("`"+tableName+"`."+orgIDName+"=?", 1).
157+
And("`"+tableName+"`."+uidName+"=?", 2).
158+
Join("INNER", "`"+tableName+"`", "`"+tableName+"`."+teamIDName+"=`"+teamTableName+"`."+idName).
150159
Find(&teams)
151160
assert.NoError(t, err)
152161

153162
teams = make([]Team, 0)
154-
err = testEngine.Cols("`team`.id").
155-
Where("`team_user`.org_id=?", 1).
156-
And("`team_user`.uid=?", 2).
157-
Join("INNER", teamUser, "`team_user`.team_id=`team`.id").
163+
err = testEngine.Cols("`"+teamTableName+"`."+idName).
164+
Where("`"+tableName+"`."+orgIDName+"=?", 1).
165+
And("`"+tableName+"`."+uidName+"=?", 2).
166+
Join("INNER", teamUser, "`"+tableName+"`."+teamIDName+"=`"+teamTableName+"`."+idName).
158167
Find(&teams)
159168
assert.NoError(t, err)
160169

161170
teams = make([]Team, 0)
162-
err = testEngine.Cols("`team`.id").
163-
Where("`team_user`.org_id=?", 1).
164-
And("`team_user`.uid=?", 2).
165-
Join("INNER", []interface{}{teamUser}, "`team_user`.team_id=`team`.id").
171+
err = testEngine.Cols("`"+teamTableName+"`."+idName).
172+
Where("`"+tableName+"`."+orgIDName+"=?", 1).
173+
And("`"+tableName+"`."+uidName+"=?", 2).
174+
Join("INNER", []interface{}{teamUser}, "`"+tableName+"`."+teamIDName+"=`"+teamTableName+"`."+idName).
166175
Find(&teams)
167176
assert.NoError(t, err)
168177

169178
teams = make([]Team, 0)
170-
err = testEngine.Cols("`team`.id").
171-
Where("`tu`.org_id=?", 1).
172-
And("`tu`.uid=?", 2).
173-
Join("INNER", []string{"team_user", "tu"}, "`tu`.team_id=`team`.id").
179+
err = testEngine.Cols("`"+teamTableName+"`.id").
180+
Where("`tu`."+orgIDName+"=?", 1).
181+
And("`tu`."+uidName+"=?", 2).
182+
Join("INNER", []string{tableName, "tu"}, "`tu`."+teamIDName+"=`"+teamTableName+"`."+idName).
174183
Find(&teams)
175184
assert.NoError(t, err)
176185

177186
teams = make([]Team, 0)
178-
err = testEngine.Cols("`team`.id").
179-
Where("`tu`.org_id=?", 1).
180-
And("`tu`.uid=?", 2).
181-
Join("INNER", []interface{}{"team_user", "tu"}, "`tu`.team_id=`team`.id").
187+
err = testEngine.Cols("`"+teamTableName+"`."+idName).
188+
Where("`tu`."+orgIDName+"=?", 1).
189+
And("`tu`."+uidName+"=?", 2).
190+
Join("INNER", []interface{}{tableName, "tu"}, "`tu`."+teamIDName+"=`"+teamTableName+"`."+idName).
182191
Find(&teams)
183192
assert.NoError(t, err)
184193

185194
teams = make([]Team, 0)
186-
err = testEngine.Cols("`team`.id").
187-
Where("`tu`.org_id=?", 1).
188-
And("`tu`.uid=?", 2).
189-
Join("INNER", []interface{}{teamUser, "tu"}, "`tu`.team_id=`team`.id").
195+
err = testEngine.Cols("`"+teamTableName+"`."+idName).
196+
Where("`tu`."+orgIDName+"=?", 1).
197+
And("`tu`."+uidName+"=?", 2).
198+
Join("INNER", []interface{}{teamUser, "tu"}, "`tu`."+teamIDName+"=`"+teamTableName+"`."+idName).
190199
Find(&teams)
191200
assert.NoError(t, err)
192201
}
@@ -197,10 +206,8 @@ func TestFindMap(t *testing.T) {
197206

198207
users := make(map[int64]Userinfo)
199208
err := testEngine.Find(&users)
200-
if err != nil {
201-
t.Error(err)
202-
panic(err)
203-
}
209+
assert.NoError(t, err)
210+
204211
for _, user := range users {
205212
fmt.Println(user)
206213
}
@@ -212,10 +219,8 @@ func TestFindMap2(t *testing.T) {
212219

213220
users := make(map[int64]*Userinfo)
214221
err := testEngine.Find(&users)
215-
if err != nil {
216-
t.Error(err)
217-
panic(err)
218-
}
222+
assert.NoError(t, err)
223+
219224
for id, user := range users {
220225
fmt.Println(id, user)
221226
}
@@ -791,13 +796,20 @@ func TestFindJoin(t *testing.T) {
791796
assert.NoError(t, prepareEngine())
792797
assertSync(t, new(SceneItem), new(DeviceUserPrivrels))
793798

799+
tableName1 := mapper.Obj2Table("SceneItem")
800+
tableName2 := mapper.Obj2Table("DeviceUserPrivrels")
801+
802+
deviceIDName := mapper.Obj2Table("DeviceId")
803+
userIDName := mapper.Obj2Table("UserId")
804+
typeName := mapper.Obj2Table("Type")
805+
794806
var scenes []SceneItem
795-
err := testEngine.Join("LEFT OUTER", "device_user_privrels", "device_user_privrels.device_id=scene_item.device_id").
796-
Where("scene_item.type=?", 3).Or("device_user_privrels.user_id=?", 339).Find(&scenes)
807+
err := testEngine.Join("LEFT OUTER", tableName2, tableName1+"."+deviceIDName+"="+tableName2+"."+deviceIDName).
808+
Where(tableName1+"."+typeName+"=?", 3).Or(tableName2+"."+userIDName+"=?", 339).Find(&scenes)
797809
assert.NoError(t, err)
798810

799811
scenes = make([]SceneItem, 0)
800-
err = testEngine.Join("LEFT OUTER", new(DeviceUserPrivrels), "device_user_privrels.device_id=scene_item.device_id").
801-
Where("scene_item.type=?", 3).Or("device_user_privrels.user_id=?", 339).Find(&scenes)
812+
err = testEngine.Join("LEFT OUTER", new(DeviceUserPrivrels), tableName1+"."+deviceIDName+"="+tableName2+"."+deviceIDName).
813+
Where(tableName1+"."+typeName+"=?", 3).Or(tableName2+"."+userIDName+"=?", 339).Find(&scenes)
802814
assert.NoError(t, err)
803815
}

0 commit comments

Comments
 (0)