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 5d34ae6

Browse files
lunnylunny
committed
fix tests
1 parent 2153786 commit 5d34ae6

15 files changed

+193
-254
lines changed

‎session_exist_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func TestExistStruct(t *testing.T) {
5656
assert.NoError(t, err)
5757
assert.False(t, has)
5858

59-
tableName := mapper.Obj2Table("RecordExist")
59+
tableName := "`" + mapper.Obj2Table("RecordExist") + "`"
6060

6161
has, err = testEngine.SQL("select * from "+testEngine.TableName(tableName, true)+" where "+nameName+" = ?", "test1").Exist()
6262
assert.NoError(t, err)

‎session_find_test.go‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ func TestJoinLimit(t *testing.T) {
5252
assert.NoError(t, err)
5353
assert.EqualValues(t, 1, cnt)
5454

55-
tableName := mapper.Obj2Table("CheckList")
56-
tableName2 := mapper.Obj2Table("Salary")
57-
tableName3 := mapper.Obj2Table("Empsetting")
55+
tableName := "`" + mapper.Obj2Table("CheckList") + "`"
56+
tableName2 := "`" + mapper.Obj2Table("Salary") + "`"
57+
tableName3 := "`" + mapper.Obj2Table("Empsetting") + "`"
5858

59-
idName := mapper.Obj2Table("Id")
60-
lIDName := mapper.Obj2Table("Lid")
61-
eIDName := mapper.Obj2Table("Eid")
59+
idName := "`" + mapper.Obj2Table("Id") + "`"
60+
lIDName := "`" + mapper.Obj2Table("Lid") + "`"
61+
eIDName := "`" + mapper.Obj2Table("Eid") + "`"
6262

6363
var salaries []Salary
6464
err = testEngine.Table(tableName2).
@@ -286,11 +286,11 @@ func TestGroupBy(t *testing.T) {
286286
assert.NoError(t, prepareEngine())
287287
assertSync(t, new(Userinfo))
288288

289-
idName := "id"
289+
idName := "`id`"
290290
userName := mapper.Obj2Table("Username")
291291

292292
users := make([]Userinfo, 0)
293-
err := testEngine.GroupBy(idName + ", " + userName).Find(&users)
293+
err := testEngine.GroupBy(idName + ", `" + userName + "`").Find(&users)
294294
assert.NoError(t, err)
295295
}
296296

@@ -609,17 +609,20 @@ func TestFindMapStringId(t *testing.T) {
609609

610610
deviceIDs := []string{"1"}
611611

612+
deviceIDName := "`" + mapper.Obj2Table("Deviceid") + "`"
613+
statusName := "`" + mapper.Obj2Table("Status") + "`"
614+
612615
deviceMaps := make(map[string]*FindMapDevice, len(deviceIDs))
613616
err = testEngine.
614-
Where("status = ?", 1).
615-
In("deviceid", deviceIDs).
617+
Where(statusName+" = ?", 1).
618+
In(deviceIDName, deviceIDs).
616619
Find(&deviceMaps)
617620
assert.NoError(t, err)
618621

619622
deviceMaps2 := make(map[string]FindMapDevice, len(deviceIDs))
620623
err = testEngine.
621-
Where("status = ?", 1).
622-
In("deviceid", deviceIDs).
624+
Where(statusName+" = ?", 1).
625+
In(deviceIDName, deviceIDs).
623626
Find(&deviceMaps2)
624627
assert.NoError(t, err)
625628

@@ -650,7 +653,7 @@ func TestFindMapStringId(t *testing.T) {
650653
assert.NoError(t, err)
651654
assert.EqualValues(t, 1, cnt)
652655

653-
sum, err := testEngine.SumInt(new(FindMapDevice), "status")
656+
sum, err := testEngine.SumInt(new(FindMapDevice), statusName)
654657
assert.NoError(t, err)
655658
assert.EqualValues(t, 2, sum)
656659

@@ -783,12 +786,12 @@ func TestFindJoin(t *testing.T) {
783786
assert.NoError(t, prepareEngine())
784787
assertSync(t, new(SceneItem), new(DeviceUserPrivrels))
785788

786-
tableName1 := mapper.Obj2Table("SceneItem")
787-
tableName2 := mapper.Obj2Table("DeviceUserPrivrels")
789+
tableName1 := "`" + mapper.Obj2Table("SceneItem") + "`"
790+
tableName2 := "`" + mapper.Obj2Table("DeviceUserPrivrels") + "`"
788791

789-
deviceIDName := mapper.Obj2Table("DeviceId")
790-
userIDName := mapper.Obj2Table("UserId")
791-
typeName := mapper.Obj2Table("Type")
792+
deviceIDName := "`" + mapper.Obj2Table("DeviceId") + "`"
793+
userIDName := "`" + mapper.Obj2Table("UserId") + "`"
794+
typeName := "`" + mapper.Obj2Table("Type") + "`"
792795

793796
var scenes []SceneItem
794797
err := testEngine.Join("LEFT OUTER", tableName2, tableName1+"."+deviceIDName+"="+tableName2+"."+deviceIDName).

‎session_get_test.go‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,20 @@ func TestGetVar(t *testing.T) {
3535
_, err := testEngine.InsertOne(&data)
3636
assert.NoError(t, err)
3737

38-
tableName := mapper.Obj2Table("GetVar")
38+
tableName := "`" + mapper.Obj2Table("GetVar") + "`"
39+
idName := mapper.Obj2Table("Id")
40+
msgName := mapper.Obj2Table("Msg")
41+
ageName := mapper.Obj2Table("Age")
42+
moneyName := mapper.Obj2Table("Money")
3943

4044
var msg string
41-
has, err := testEngine.Table(tableName).Cols("msg").Get(&msg)
45+
has, err := testEngine.Table(tableName).Cols("`" + msgName + "`").Get(&msg)
4246
assert.NoError(t, err)
4347
assert.Equal(t, true, has)
4448
assert.Equal(t, "hi", msg)
4549

4650
var age int
47-
has, err = testEngine.Table(tableName).Cols("age").Get(&age)
51+
has, err = testEngine.Table(tableName).Cols("`" + ageName + "`").Get(&age)
4852
assert.NoError(t, err)
4953
assert.Equal(t, true, has)
5054
assert.Equal(t, 28, age)
@@ -56,9 +60,9 @@ func TestGetVar(t *testing.T) {
5660
assert.Equal(t, 28, ageMax)
5761

5862
var age2 int64
59-
has, err = testEngine.Table(tableName).Cols("age").
60-
Where("age > ?", 20).
61-
And("age < ?", 30).
63+
has, err = testEngine.Table(tableName).Cols("`"+ageName+"`").
64+
Where("`"+ageName+"` > ?", 20).
65+
And("`"+ageName+"` < ?", 30).
6266
Get(&age2)
6367
assert.NoError(t, err)
6468
assert.Equal(t, true, has)
@@ -128,52 +132,47 @@ func TestGetVar(t *testing.T) {
128132
assert.EqualValues(t, 28, age10)
129133

130134
var id sql.NullInt64
131-
has, err = testEngine.Table(tableName).Cols("id").Get(&id)
135+
has, err = testEngine.Table(tableName).Cols("`" + idName + "`").Get(&id)
132136
assert.NoError(t, err)
133137
assert.Equal(t, true, has)
134138
assert.Equal(t, true, id.Valid)
135139
assert.EqualValues(t, data.Id, id.Int64)
136140

137141
var msgNull sql.NullString
138-
has, err = testEngine.Table(tableName).Cols("msg").Get(&msgNull)
142+
has, err = testEngine.Table(tableName).Cols("`" + msgName + "`").Get(&msgNull)
139143
assert.NoError(t, err)
140144
assert.Equal(t, true, has)
141145
assert.Equal(t, true, msgNull.Valid)
142146
assert.EqualValues(t, data.Msg, msgNull.String)
143147

144148
var nullMoney sql.NullFloat64
145-
has, err = testEngine.Table(tableName).Cols("money").Get(&nullMoney)
149+
has, err = testEngine.Table(tableName).Cols("`" + moneyName + "`").Get(&nullMoney)
146150
assert.NoError(t, err)
147151
assert.Equal(t, true, has)
148152
assert.Equal(t, true, nullMoney.Valid)
149153
assert.EqualValues(t, data.Money, nullMoney.Float64)
150154

151155
var money float64
152-
has, err = testEngine.Table(tableName).Cols("money").Get(&money)
156+
has, err = testEngine.Table(tableName).Cols("`" + moneyName + "`").Get(&money)
153157
assert.NoError(t, err)
154158
assert.Equal(t, true, has)
155159
assert.Equal(t, "1.5", fmt.Sprintf("%.1f", money))
156160

157161
var money2 float64
158162
if testEngine.Dialect().DBType() == core.MSSQL {
159-
has, err = testEngine.SQL("SELECT TOP 1 money FROM " + testEngine.TableName(tableName, true)).Get(&money2)
163+
has, err = testEngine.SQL("SELECT TOP 1 `" + moneyName + "` FROM " + testEngine.TableName(tableName, true)).Get(&money2)
160164
} else {
161-
has, err = testEngine.SQL("SELECT money FROM " + testEngine.TableName(tableName, true) + " LIMIT 1").Get(&money2)
165+
has, err = testEngine.SQL("SELECT `" + moneyName + "` FROM " + testEngine.TableName(tableName, true) + " LIMIT 1").Get(&money2)
162166
}
163167
assert.NoError(t, err)
164168
assert.Equal(t, true, has)
165169
assert.Equal(t, "1.5", fmt.Sprintf("%.1f", money2))
166170

167171
var money3 float64
168-
has, err = testEngine.SQL("SELECT money FROM " + testEngine.TableName(tableName, true) + " WHERE money > 20").Get(&money3)
172+
has, err = testEngine.SQL("SELECT `" + moneyName + "` FROM " + testEngine.TableName(tableName, true) + " WHERE `" + moneyName + "` > 20").Get(&money3)
169173
assert.NoError(t, err)
170174
assert.Equal(t, false, has)
171175

172-
idName := mapper.Obj2Table("Id")
173-
ageName := mapper.Obj2Table("Age")
174-
msgName := mapper.Obj2Table("Msg")
175-
moneyName := mapper.Obj2Table("Money")
176-
177176
var valuesString = make(map[string]string)
178177
has, err = testEngine.Table(tableName).Get(&valuesString)
179178
assert.NoError(t, err)
@@ -187,7 +186,7 @@ func TestGetVar(t *testing.T) {
187186
// for mymysql driver, interface{} will be []byte, so ignore it currently
188187
if testEngine.Dialect().DriverName() != "mymysql" {
189188
var valuesInter = make(map[string]interface{})
190-
has, err = testEngine.Table(tableName).Where(idName+" = ?", 1).Select("*").Get(&valuesInter)
189+
has, err = testEngine.Table(tableName).Where("`"+idName+"` = ?", 1).Select("*").Get(&valuesInter)
191190
assert.NoError(t, err)
192191
assert.Equal(t, true, has)
193192
assert.Equal(t, 5, len(valuesInter))
@@ -405,10 +404,10 @@ func TestGetStructId(t *testing.T) {
405404
Id int64
406405
}
407406

408-
idName := mapper.Obj2Table("Id")
407+
idName := "`" + mapper.Obj2Table("Id") + "`"
409408
//var id int64
410409
var maxid maxidst
411-
sql := "select max(" + idName + ") as id from " + testEngine.TableName(&TestGetStruct{}, true)
410+
sql := "select max(" + idName + ") as id from " + testEngine.Quote(testEngine.TableName(&TestGetStruct{}, true))
412411
has, err := testEngine.SQL(sql).Get(&maxid)
413412
assert.NoError(t, err)
414413
assert.True(t, has)

‎session_insert_test.go‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -768,10 +768,14 @@ func TestInsertMap(t *testing.T) {
768768
assert.NoError(t, prepareEngine())
769769
assertSync(t, new(InsertMap))
770770

771+
widthName := mapper.Obj2Table("Width")
772+
heightName := mapper.Obj2Table("Height")
773+
nameName := mapper.Obj2Table("Name")
774+
771775
cnt, err := testEngine.Table(new(InsertMap)).Insert(map[string]interface{}{
772-
"width": 20,
773-
"height": 10,
774-
"name": "lunny",
776+
widthName: 20,
777+
heightName: 10,
778+
nameName: "lunny",
775779
})
776780
assert.NoError(t, err)
777781
assert.EqualValues(t, 1, cnt)
@@ -787,9 +791,9 @@ func TestInsertMap(t *testing.T) {
787791
tableName := mapper.Obj2Table("InsertMap")
788792

789793
cnt, err = testEngine.Table(tableName).Insert(map[string]interface{}{
790-
"width": 30,
791-
"height": 10,
792-
"name": "lunny",
794+
widthName: 30,
795+
heightName: 10,
796+
nameName: "lunny",
793797
})
794798
assert.NoError(t, err)
795799
assert.EqualValues(t, 1, cnt)
@@ -807,14 +811,14 @@ func TestInsertMap(t *testing.T) {
807811

808812
cnt, err = testEngine.Table(tableName).Insert([]map[string]interface{}{
809813
{
810-
"width": 40,
811-
"height": 10,
812-
"name": "lunny",
814+
widthName: 40,
815+
heightName: 10,
816+
nameName: "lunny",
813817
},
814818
{
815-
"width": 50,
816-
"height": 10,
817-
"name": "lunny",
819+
widthName: 50,
820+
heightName: 10,
821+
nameName: "lunny",
818822
},
819823
})
820824
assert.NoError(t, err)

‎session_query_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func TestQueryString(t *testing.T) {
3939

4040
tableName := mapper.Obj2Table("GetVar2")
4141

42-
records, err := testEngine.QueryString("select * from " + testEngine.TableName(tableName, true))
42+
records, err := testEngine.QueryString("select * from `" + testEngine.TableName(tableName, true) + "`")
4343
assert.NoError(t, err)
4444
assert.Equal(t, 1, len(records))
4545
assert.Equal(t, 5, len(records[0]))
@@ -71,7 +71,7 @@ func TestQueryString2(t *testing.T) {
7171
_, err := testEngine.Insert(data)
7272
assert.NoError(t, err)
7373

74-
tableName := mapper.Obj2Table("GetVar3")
74+
tableName := "`" + mapper.Obj2Table("GetVar3") + "`"
7575

7676
idName := mapper.Obj2Table("Id")
7777
msgName := mapper.Obj2Table("Msg")
@@ -141,7 +141,7 @@ func TestQueryInterface(t *testing.T) {
141141
_, err := testEngine.InsertOne(data)
142142
assert.NoError(t, err)
143143

144-
tableName := mapper.Obj2Table("GetVarInterface")
144+
tableName := "`" + mapper.Obj2Table("GetVarInterface") + "`"
145145
idName := mapper.Obj2Table("Id")
146146
msgName := mapper.Obj2Table("Msg")
147147
ageName := mapper.Obj2Table("Age")
@@ -202,7 +202,7 @@ func TestQueryNoParams(t *testing.T) {
202202
assert.EqualValues(t, 3000, money)
203203
}
204204

205-
tableName := mapper.Obj2Table("QueryNoParams")
205+
tableName := "`" + mapper.Obj2Table("QueryNoParams") + "`"
206206
results, err := testEngine.Table(tableName).Limit(10).Query()
207207
assert.NoError(t, err)
208208
assertResult(t, results)
@@ -228,7 +228,7 @@ func TestQueryStringNoParam(t *testing.T) {
228228
_, err := testEngine.Insert(data)
229229
assert.NoError(t, err)
230230

231-
tableName := mapper.Obj2Table("GetVar4")
231+
tableName := "`" + mapper.Obj2Table("GetVar4") + "`"
232232

233233
idName := mapper.Obj2Table("Id")
234234
msgName := mapper.Obj2Table("Msg")
@@ -243,7 +243,7 @@ func TestQueryStringNoParam(t *testing.T) {
243243
assert.EqualValues(t, "0", records[0][msgName])
244244
}
245245

246-
records, err = testEngine.Table(tableName).Where(builder.Eq{idName: 1}).QueryString()
246+
records, err = testEngine.Table(tableName).Where(builder.Eq{"`" + idName + "`": 1}).QueryString()
247247
assert.NoError(t, err)
248248
assert.EqualValues(t, 1, len(records))
249249
assert.EqualValues(t, "1", records[0][idName])
@@ -270,7 +270,7 @@ func TestQuerySliceStringNoParam(t *testing.T) {
270270
_, err := testEngine.Insert(data)
271271
assert.NoError(t, err)
272272

273-
tableName := mapper.Obj2Table("GetVar6")
273+
tableName := "`" + mapper.Obj2Table("GetVar6") + "`"
274274

275275
records, err := testEngine.Table(tableName).Limit(1).QuerySliceString()
276276
assert.NoError(t, err)
@@ -283,7 +283,7 @@ func TestQuerySliceStringNoParam(t *testing.T) {
283283
}
284284

285285
idName := mapper.Obj2Table("Id")
286-
records, err = testEngine.Table(tableName).Where(builder.Eq{idName: 1}).QuerySliceString()
286+
records, err = testEngine.Table(tableName).Where(builder.Eq{"`" + idName + "`": 1}).QuerySliceString()
287287
assert.NoError(t, err)
288288
assert.EqualValues(t, 1, len(records))
289289
assert.EqualValues(t, "1", records[0][0])
@@ -310,7 +310,7 @@ func TestQueryInterfaceNoParam(t *testing.T) {
310310
_, err := testEngine.Insert(data)
311311
assert.NoError(t, err)
312312

313-
tableName := mapper.Obj2Table("GetVar5")
313+
tableName := "`" + mapper.Obj2Table("GetVar5") + "`"
314314
idName := mapper.Obj2Table("Id")
315315
msgName := mapper.Obj2Table("Msg")
316316

@@ -320,7 +320,7 @@ func TestQueryInterfaceNoParam(t *testing.T) {
320320
assert.EqualValues(t, 1, toInt64(records[0][idName]))
321321
assert.EqualValues(t, 0, toInt64(records[0][msgName]))
322322

323-
records, err = testEngine.Table(tableName).Where(builder.Eq{idName: 1}).QueryInterface()
323+
records, err = testEngine.Table(tableName).Where(builder.Eq{"`" + idName + "`": 1}).QueryInterface()
324324
assert.NoError(t, err)
325325
assert.EqualValues(t, 1, len(records))
326326
assert.EqualValues(t, 1, toInt64(records[0][idName]))
@@ -373,7 +373,7 @@ func TestQueryWithBuilder(t *testing.T) {
373373
}
374374

375375
tableName := mapper.Obj2Table("QueryWithBuilder")
376-
results, err := testEngine.Query(builder.Select("*").From(testEngine.TableName(tableName, true)))
376+
results, err := testEngine.Query(builder.Select("*").From("`" + testEngine.TableName(tableName, true) + "`"))
377377
assert.NoError(t, err)
378378
assertResult(t, results)
379379
}
@@ -414,11 +414,11 @@ func TestJoinWithSubQuery(t *testing.T) {
414414
assert.NoError(t, err)
415415
assert.EqualValues(t, 1, cnt)
416416

417-
tableName := mapper.Obj2Table("JoinWithSubQueryDepart")
418-
tableName1 := mapper.Obj2Table("JoinWithSubQuery1")
417+
tableName := "`" + mapper.Obj2Table("JoinWithSubQueryDepart") + "`"
418+
tableName1 := "`" + mapper.Obj2Table("JoinWithSubQuery1") + "`"
419419

420-
departID := mapper.Obj2Table("DepartId")
421-
idName := mapper.Obj2Table("Id")
420+
departID := "`" + mapper.Obj2Table("DepartId") + "`"
421+
idName := "`" + mapper.Obj2Table("Id") + "`"
422422

423423
var querys []JoinWithSubQuery1
424424
err = testEngine.Join("INNER", builder.Select(idName).From(testEngine.Quote(testEngine.TableName(tableName, true))),

‎session_raw_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ func TestExecAndQuery(t *testing.T) {
2525
uidName := mapper.Obj2Table("Uid")
2626
nameName := mapper.Obj2Table("Name")
2727

28-
res, err := testEngine.Exec("INSERT INTO "+testEngine.TableName(tableName, true)+" ("+uidName+", "+nameName+") VALUES (?, ?)", 1, "user")
28+
res, err := testEngine.Exec("INSERT INTO `"+testEngine.TableName(tableName, true)+"` (`"+uidName+"`, `"+nameName+"`) VALUES (?, ?)", 1, "user")
2929
assert.NoError(t, err)
3030
cnt, err := res.RowsAffected()
3131
assert.NoError(t, err)
3232
assert.EqualValues(t, 1, cnt)
3333

34-
results, err := testEngine.Query("select * from " + testEngine.TableName(tableName, true))
34+
results, err := testEngine.Query("select * from `" + testEngine.TableName(tableName, true) + "`")
3535
assert.NoError(t, err)
3636
assert.EqualValues(t, 1, len(results))
3737
id, err := strconv.Atoi(string(results[0][uidName]))

0 commit comments

Comments
 (0)