From 908813823bbf03dba318ae959a1b6c6e5dfd29f7 Mon Sep 17 00:00:00 2001 From: Xin Hao Date: Wed, 31 Jan 2024 13:28:57 +0800 Subject: [PATCH] fix --- result_set.go | 8 ++++++++ result_set_test.go | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/result_set.go b/result_set.go index ca01ddde..02f0b3e1 100644 --- a/result_set.go +++ b/result_set.go @@ -361,8 +361,16 @@ func (res ResultSet) scanRow(row *nebula.Row, colNames []string, t reflect.Type) val.Field(fIdx).SetBool(rowVal.GetBVal()) case reflect.Int: val.Field(fIdx).SetInt(rowVal.GetIVal()) + case reflect.Int8: + val.Field(fIdx).SetInt(rowVal.GetIVal()) + case reflect.Int16: + val.Field(fIdx).SetInt(rowVal.GetIVal()) + case reflect.Int32: + val.Field(fIdx).SetInt(rowVal.GetIVal()) case reflect.Int64: val.Field(fIdx).SetInt(rowVal.GetIVal()) + case reflect.Float32: + val.Field(fIdx).SetFloat(rowVal.GetFVal()) case reflect.Float64: val.Field(fIdx).SetFloat(rowVal.GetFVal()) case reflect.String: diff --git a/result_set_test.go b/result_set_test.go index bb319c74..5238b222 100644 --- a/result_set_test.go +++ b/result_set_test.go @@ -814,7 +814,7 @@ func TestScan(t *testing.T) { assert.Equal(t, 1, len(testStructList)) assert.Equal(t, int64(1), testStructList[0].Col0) assert.Equal(t, float64(2.0), testStructList[0].Col1) - assert.Equal(t, "string", testStructList[0].Col1) + assert.Equal(t, "string", testStructList[0].Col2) assert.Equal(t, true, testStructList[0].Col3) // Scan again should work @@ -825,11 +825,11 @@ func TestScan(t *testing.T) { assert.Equal(t, 2, len(testStructList)) assert.Equal(t, int64(1), testStructList[0].Col0) assert.Equal(t, float64(2.0), testStructList[0].Col1) - assert.Equal(t, "string", testStructList[0].Col1) + assert.Equal(t, "string", testStructList[0].Col2) assert.Equal(t, true, testStructList[0].Col3) assert.Equal(t, int64(1), testStructList[1].Col0) assert.Equal(t, float64(2.0), testStructList[1].Col1) - assert.Equal(t, "string", testStructList[1].Col1) + assert.Equal(t, "string", testStructList[1].Col2) assert.Equal(t, true, testStructList[1].Col3) } @@ -1015,8 +1015,8 @@ func getDateset2() *nebula.DataSet { var v4 = nebula.NewValue() b4 := new(bool) - *b4 = bool(true) - v2.BVal = b4 + *b4 = true + v4.BVal = b4 valueList := []*nebula.Value{v1, v2, v3, v4} var rows []*nebula.Row