Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

server: Correct the check for Resultset #983

Merged
merged 1 commit into from
Feb 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions mysql/result.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,10 @@ func (r *Result) Close() {
r.Resultset = nil
}
}

func (r *Result) HasResultset() bool {
if r.Resultset != nil && len(r.Resultset.Fields) > 0 {
return true
}
return false
}
19 changes: 19 additions & 0 deletions mysql/result_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package mysql

import (
"testing"

"github.com/stretchr/testify/require"
)

func TestHasResultset_false(t *testing.T) {
r := NewResultReserveResultset(0)
b := r.HasResultset()
require.Equal(t, false, b)
}

func TestHasResultset_true(t *testing.T) {
r := NewResultReserveResultset(1)
b := r.HasResultset()
require.Equal(t, true, b)
}
2 changes: 1 addition & 1 deletion server/resp.go
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ func (c *Conn) WriteValue(value interface{}) error {
case nil:
return c.writeOK(nil)
case *Result:
if v != nil && v.Resultset != nil {
if v != nil && v.HasResultset() {
return c.writeResultset(v.Resultset)
} else {
return c.writeOK(v)
Expand Down
Loading