up

gogf · Feb 28, 2025 · e311630 · e311630
1 parent e83d378
commit e311630
Show file tree

Hide file tree

Showing 12 changed files with 133 additions and 197 deletions.
diff --git a/contrib/drivers/mysql/db_utils_test.go b/contrib/drivers/mysql/db_utils_test.go
diff --git a/contrib/drivers/mysql/mysql_z_unit_issue_test.go b/contrib/drivers/mysql/mysql_z_unit_issue_test.go
@@ -1719,9 +1719,9 @@ func Test_Issue4086(t *testing.T) {
 
 	gtest.C(t, func(t *gtest.T) {
 		type ProxyParam struct {
-			ProxyId      int64    `json:"proxyId" orm:"proxy_id"`
-			RecommendIds []int64  `json:"recommendIds" orm:"recommend_ids"`
-			Photos       []string `json:"photos" orm:"photos"`
+			ProxyId      int64   `json:"proxyId" orm:"proxy_id"`
+			RecommendIds []int64 `json:"recommendIds" orm:"recommend_ids"`
+			Photos       []int64 `json:"photos" orm:"photos"`
 		}
 
 		var proxyParamList []*ProxyParam
@@ -1744,9 +1744,34 @@ func Test_Issue4086(t *testing.T) {
 
 	gtest.C(t, func(t *gtest.T) {
 		type ProxyParam struct {
-			ProxyId      int64   `json:"proxyId" orm:"proxy_id"`
-			RecommendIds []int64 `json:"recommendIds" orm:"recommend_ids"`
-			Photos       []int64 `json:"photos" orm:"photos"`
+			ProxyId      int64     `json:"proxyId" orm:"proxy_id"`
+			RecommendIds []int64   `json:"recommendIds" orm:"recommend_ids"`
+			Photos       []float32 `json:"photos" orm:"photos"`
+		}
+
+		var proxyParamList []*ProxyParam
+		err := db.Model(table).Ctx(ctx).Scan(&proxyParamList)
+		t.AssertNil(err)
+		t.Assert(len(proxyParamList), 2)
+		t.Assert(proxyParamList, []*ProxyParam{
+			{
+				ProxyId:      1,
+				RecommendIds: []int64{584, 585},
+				Photos:       nil,
+			},
+			{
+				ProxyId:      2,
+				RecommendIds: []int64{},
+				Photos:       nil,
+			},
+		})
+	})
+
+	gtest.C(t, func(t *gtest.T) {
+		type ProxyParam struct {
+			ProxyId      int64    `json:"proxyId" orm:"proxy_id"`
+			RecommendIds []int64  `json:"recommendIds" orm:"recommend_ids"`
+			Photos       []string `json:"photos" orm:"photos"`
 		}
 
 		var proxyParamList []*ProxyParam

diff --git a/util/gconv/gconv_basic.go b/util/gconv/gconv_basic.go
@@ -17,6 +17,7 @@ import (
 	"github.com/gogf/gf/v2/encoding/gbinary"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/internal/reflection"
 	"github.com/gogf/gf/v2/os/gtime"
@@ -43,7 +44,7 @@ func Bytes(any any) []byte {
 }
 
 func doBytes(any any) ([]byte, error) {
-	if any == nil {
+	if empty.IsNil(any) {
 		return nil, nil
 	}
 	switch value := any.(type) {
@@ -133,7 +134,7 @@ func String(any any) string {
 }
 
 func doString(any any) (string, error) {
-	if any == nil {
+	if empty.IsNil(any) {
 		return "", nil
 	}
 	switch value := any.(type) {
@@ -254,7 +255,7 @@ func Bool(any any) bool {
 }
 
 func doBool(any any) (bool, error) {
-	if any == nil {
+	if empty.IsNil(any) {
 		return false, nil
 	}
 	switch value := any.(type) {

diff --git a/util/gconv/gconv_float.go b/util/gconv/gconv_float.go
@@ -13,6 +13,7 @@ import (
 	"github.com/gogf/gf/v2/encoding/gbinary"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/util/gconv/internal/localinterface"
 )
 
@@ -23,7 +24,7 @@ func Float32(any any) float32 {
 }
 
 func doFloat32(any any) (float32, error) {
-	if any == nil {
+	if empty.IsNil(any) {
 		return 0, nil
 	}
 	switch value := any.(type) {
@@ -86,7 +87,7 @@ func Float64(any any) float64 {
 }
 
 func doFloat64(any any) (float64, error) {
-	if any == nil {
+	if empty.IsNil(any) {
 		return 0, nil
 	}
 	switch value := any.(type) {

diff --git a/util/gconv/gconv_int.go b/util/gconv/gconv_int.go
@@ -14,6 +14,7 @@ import (
 	"github.com/gogf/gf/v2/encoding/gbinary"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/util/gconv/internal/localinterface"
 )
 
@@ -92,7 +93,7 @@ func Int64(any any) int64 {
 }
 
 func doInt64(any any) (int64, error) {
-	if any == nil {
+	if empty.IsNil(any) {
 		return 0, nil
 	}
 	if v, ok := any.(int64); ok {

diff --git a/util/gconv/gconv_slice_any.go b/util/gconv/gconv_slice_any.go
@@ -7,8 +7,11 @@
 package gconv
 
 import (
+	"bytes"
 	"reflect"
+	"strings"
 
+	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/internal/reflection"
 	"github.com/gogf/gf/v2/util/gconv/internal/localinterface"
@@ -21,7 +24,7 @@ func SliceAny(any interface{}) []interface{} {
 
 // Interfaces converts `any` to []interface{}.
 func Interfaces(any interface{}) []interface{} {
-	if any == nil {
+	if empty.IsNil(any) {
 		return nil
 	}
 	var array []interface{}
@@ -68,6 +71,9 @@ func Interfaces(any interface{}) []interface{} {
 			if _ = json.UnmarshalUseNumber(value, &array); array != nil {
 				return array
 			}
+			if bytes.EqualFold([]byte("null"), value) {
+				return nil
+			}
 		}
 		array = make([]interface{}, len(value))
 		for k, v := range value {
@@ -79,6 +85,9 @@ func Interfaces(any interface{}) []interface{} {
 			if _ = json.UnmarshalUseNumber(byteValue, &array); array != nil {
 				return array
 			}
+			if strings.EqualFold(value, "null") {
+				return nil
+			}
 		}
 
 	case []uint16: