ability to send multiple resultsets from handleQuery

go-mysql-org · Nov 10, 2020 · 379882c · 379882c
1 parent a4724a0
commit 379882c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/server/caching_sha2_cache_test.go b/server/caching_sha2_cache_test.go
@@ -209,8 +209,13 @@ func (h *testCacheHandler) handleQuery(query string, binary bool) (*mysql.Result
 	return nil, nil
 }
 
-func (h *testCacheHandler) HandleQuery(query string) (*mysql.Result, error) {
-	return h.handleQuery(query, false)
+func (h *testCacheHandler) HandleQuery(query string) ([]*mysql.Result, error) {
+    res, err := h.handleQuery(query, false)
+    if err != nil {
+        return nil, err
+    }
+
+    return []*mysql.Result{res}, nil
 }
 
 func (h *testCacheHandler) HandleFieldList(table string, fieldWildcard string) ([]*mysql.Field, error) {

diff --git a/server/command.go b/server/command.go
@@ -134,7 +134,7 @@ type EmptyHandler struct {
 func (h EmptyHandler) UseDB(dbName string) error {
 	return nil
 }
-func (h EmptyHandler) HandleQuery(query string) (*Result, error) {
+func (h EmptyHandler) HandleQuery(query string) ([]*Result, error) {
 	return nil, fmt.Errorf("not supported now")
 }
 

diff --git a/server/server_test.go b/server/server_test.go
@@ -257,7 +257,13 @@ func (h *testHandler) handleQuery(query string, binary bool) (*mysql.Result, err
 }
 
 func (h *testHandler) HandleQuery(query string) (*mysql.Result, error) {
-	return h.handleQuery(query, false)
+    res, err := h.handleQuery(query, false)
+    if err != nil {
+                 return nil, err
+
+    }
+
+    return []*mysql.Result{res}, nil
 }
 
 func (h *testHandler) HandleFieldList(table string, fieldWildcard string) ([]*mysql.Field, error) {