Skip to content

Commit f98087c

Browse files
committed
handle nil result correctly, and test nil resultset correctly
1 parent 21883cd commit f98087c

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

mysql/result.go

+3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ func (r *Result) Close() {
3636
}
3737

3838
func (r *Result) HasResultset() bool {
39+
if r == nil {
40+
return false
41+
}
3942
if r.Resultset != nil && len(r.Resultset.Fields) > 0 {
4043
return true
4144
}

mysql/result_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ func TestHasResultset_true(t *testing.T) {
1919
}
2020

2121
// this shouldn't happen after d02e79a, but test just in case
22+
func TestHasResultset_nilset(t *testing.T) {
23+
r := NewResultReserveResultset(0)
24+
r.Resultset = nil
25+
b := r.HasResultset()
26+
require.Equal(t, false, b)
27+
}
28+
2229
func TestHasResultset_nil(t *testing.T) {
2330
var r *Result
2431
b := r.HasResultset()

0 commit comments

Comments
 (0)