Skip to content

Commit 379882c

Browse files
committed
ability to send multiple resultsets from handleQuery
1 parent a4724a0 commit 379882c

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

server/caching_sha2_cache_test.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,13 @@ func (h *testCacheHandler) handleQuery(query string, binary bool) (*mysql.Result
209209
return nil, nil
210210
}
211211

212-
func (h *testCacheHandler) HandleQuery(query string) (*mysql.Result, error) {
213-
return h.handleQuery(query, false)
212+
func (h *testCacheHandler) HandleQuery(query string) ([]*mysql.Result, error) {
213+
res, err := h.handleQuery(query, false)
214+
if err != nil {
215+
return nil, err
216+
}
217+
218+
return []*mysql.Result{res}, nil
214219
}
215220

216221
func (h *testCacheHandler) HandleFieldList(table string, fieldWildcard string) ([]*mysql.Field, error) {

server/command.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ type EmptyHandler struct {
134134
func (h EmptyHandler) UseDB(dbName string) error {
135135
return nil
136136
}
137-
func (h EmptyHandler) HandleQuery(query string) (*Result, error) {
137+
func (h EmptyHandler) HandleQuery(query string) ([]*Result, error) {
138138
return nil, fmt.Errorf("not supported now")
139139
}
140140

server/server_test.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,13 @@ func (h *testHandler) handleQuery(query string, binary bool) (*mysql.Result, err
257257
}
258258

259259
func (h *testHandler) HandleQuery(query string) (*mysql.Result, error) {
260-
return h.handleQuery(query, false)
260+
res, err := h.handleQuery(query, false)
261+
if err != nil {
262+
return nil, err
263+
264+
}
265+
266+
return []*mysql.Result{res}, nil
261267
}
262268

263269
func (h *testHandler) HandleFieldList(table string, fieldWildcard string) ([]*mysql.Field, error) {

0 commit comments

Comments
 (0)