gvalue MapToStruct

snail007 · Jan 9, 2024 · 9b5ce17 · 9b5ce17
1 parent e7f8aca
commit 9b5ce17
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/module/db/mysql_test.go b/module/db/mysql_test.go
@@ -280,7 +280,7 @@ var (
 func TestStruct(t *testing.T) {
 	assert := assert.New(t)
 	rs := NewResultSet(&rawRows)
-	s, err := rs.Struct(User{})
+	s, err := rs.Struct(&User{})
 	assert.Nil(err)
 	assert.Equal("jack", s.(User).Name)
 	assert.Equal(int(229), s.(User).ID)
@@ -292,7 +292,7 @@ func TestStruct(t *testing.T) {
 func TestStructs(t *testing.T) {
 	assert := assert.New(t)
 	rs := NewResultSet(&rawRows)
-	sts, err := rs.Structs(User{})
+	sts, err := rs.Structs(&User{})
 	assert.Nil(err)
 	for _, s := range sts {
 		assert.Equal("jack", s.(User).Name)
@@ -306,7 +306,7 @@ func TestStructs(t *testing.T) {
 func TestMapStructs(t *testing.T) {
 	assert := assert.New(t)
 	rs := NewResultSet(&rawRows)
-	sts, err := rs.MapStructs("pid", User{})
+	sts, err := rs.MapStructs("pid", &User{})
 	assert.Nil(err)
 	for _, s := range sts {
 		assert.Equal("jack", s.(User).Name)

diff --git a/module/db/resultset.go b/module/db/resultset.go
@@ -149,5 +149,5 @@ func (rs *ResultSet) mapToStruct(mapData map[string]string, structValue interfac
 	if len(tagName) == 1 {
 		tag = tagName[0]
 	}
-	return gvalue.MapToStruct(gmap.ToAny(mapData), structValue, tag)
+	return gvalue.MapToStructWithTag(gmap.ToAny(mapData), structValue, tag)
 }
diff --git a/module/db/resultset_test.go b/module/db/resultset_test.go
@@ -30,23 +30,23 @@ type cc struct {
 func TestResultSet_mapToStruct(t *testing.T) {
 	m := map[string]string{"B": `{"C":{"1":"1"}}`}
 	rs := ResultSet{}
-	r, e := rs.mapToStruct(m, a{})
+	r, e := rs.mapToStruct(m, &a{})
 	assert.Nil(t, e)
 	assert.Equal(t, "1", r.(a).B["C"].(map[string]interface{})["1"])
 }
 
 func TestResultSet_mapToStruct1(t *testing.T) {
 	m := map[string]string{"B": `{"C":"1"}`}
 	rs := ResultSet{}
-	r, e := rs.mapToStruct(m, c{})
+	r, e := rs.mapToStruct(m, &c{})
 	assert.Nil(t, e)
 	assert.Equal(t, "1", r.(c).B.C)
 }
 
 func TestResultSet_mapToStruct2(t *testing.T) {
 	m := map[string]string{"B": `{"C":"1"}`}
 	rs := ResultSet{}
-	r, e := rs.mapToStruct(m, cc{})
+	r, e := rs.mapToStruct(m, &cc{})
 	assert.Nil(t, e)
 	assert.Equal(t, "1", r.(cc).B.C)
 }
@@ -152,7 +152,7 @@ func TestResultSet_MapStructs(t *testing.T) {
 		Name string `column:"name"`
 	}
 
-	structsMap, err := rs.MapStructs("id", Person{})
+	structsMap, err := rs.MapStructs("id", &Person{})
 
 	if err != nil {
 		t.Errorf("Unexpected error: %v", err)
@@ -223,7 +223,7 @@ func TestResultSet_Structs(t *testing.T) {
 		Name string `column:"name"`
 	}
 
-	structs, err := rs.Structs(Person{})
+	structs, err := rs.Structs(&Person{})
 
 	if err != nil {
 		t.Errorf("Unexpected error: %v", err)
@@ -288,7 +288,7 @@ func TestResultSet_Struct(t *testing.T) {
 		Name string `column:"name"`
 	}
 
-	person, err := rs.Struct(Person{})
+	person, err := rs.Struct(&Person{})
 
 	if err != nil {
 		t.Errorf("Unexpected error: %v", err)
@@ -388,7 +388,7 @@ func TestMapToStruct(t *testing.T) {
 		"bytes":       "SGVsbG8gd29ybGQ=", //base64： Hello world
 	}
 	rs := &ResultSet{}
-	result, err := rs.mapToStruct(mapData, TestStruct0{})
+	result, err := rs.mapToStruct(mapData, &TestStruct0{})
 	if err != nil {
 		t.Errorf("Unexpected error: %v", err)
 	}

diff --git a/module/db/sqlite3_test.go b/module/db/sqlite3_test.go
@@ -282,7 +282,7 @@ var (
 func TestStruct1(t *testing.T) {
 	assert := assert.New(t)
 	rs := NewResultSet(&rawRows1)
-	s, err := rs.Struct(User1{})
+	s, err := rs.Struct(&User1{})
 	assert.Nil(err)
 	assert.Equal("jack", s.(User1).Name)
 	assert.Equal(int(229), s.(User1).ID)
@@ -294,7 +294,7 @@ func TestStruct1(t *testing.T) {
 func TestStructs1(t *testing.T) {
 	assert := assert.New(t)
 	rs := NewResultSet(&rawRows1)
-	sts, err := rs.Structs(User1{})
+	sts, err := rs.Structs(&User1{})
 	assert.Nil(err)
 	for _, s := range sts {
 		assert.Equal("jack", s.(User1).Name)
@@ -308,7 +308,7 @@ func TestStructs1(t *testing.T) {
 func TestMapStructs1(t *testing.T) {
 	assert := assert.New(t)
 	rs := NewResultSet(&rawRows1)
-	sts, err := rs.MapStructs("pid", User1{})
+	sts, err := rs.MapStructs("pid", &User1{})
 	assert.Nil(err)
 	for _, s := range sts {
 		assert.Equal("jack", s.(User1).Name)