Skip to content

Commit 0462083

Browse files
committed
update server tests to use constructor convention from d02e79a
1 parent b39e40d commit 0462083

File tree

2 files changed

+10
-25
lines changed

2 files changed

+10
-25
lines changed

server/resp_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ func TestConnWriteOK(t *testing.T) {
1414
clientConn := &mockconn.MockConn{}
1515
conn := &Conn{Conn: packet.NewConn(clientConn)}
1616

17-
result := &mysql.Result{
18-
AffectedRows: 1,
19-
InsertId: 2,
20-
}
17+
result := mysql.NewResultReserveResultset(0)
18+
result.AffectedRows = 1
19+
result.InsertId = 2
2120

2221
// write ok with insertid and affectedrows set
2322
err := conn.writeOK(result)

server/server_test.go

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -244,30 +244,16 @@ func (h *testHandler) handleQuery(query string, binary bool) (*mysql.Result, err
244244
if err != nil {
245245
return nil, errors.Trace(err)
246246
} else {
247-
return &mysql.Result{
248-
Status: 0,
249-
Warnings: 0,
250-
InsertId: 0,
251-
AffectedRows: 0,
252-
Resultset: r,
253-
}, nil
247+
return mysql.NewResult(r), nil
254248
}
255249
case "insert":
256-
return &mysql.Result{
257-
Status: 0,
258-
Warnings: 0,
259-
InsertId: 1,
260-
AffectedRows: 0,
261-
Resultset: nil,
262-
}, nil
250+
res := mysql.NewResultReserveResultset(0)
251+
res.InsertId = 1
252+
return res, nil
263253
case "delete", "update", "replace":
264-
return &mysql.Result{
265-
Status: 0,
266-
Warnings: 0,
267-
InsertId: 0,
268-
AffectedRows: 1,
269-
Resultset: nil,
270-
}, nil
254+
res := mysql.NewResultReserveResultset(0)
255+
res.AffectedRows = 1
256+
return res, nil
271257
default:
272258
return nil, fmt.Errorf("invalid query %s", query)
273259
}

0 commit comments

Comments
 (0)