blackteay/gf
1
0
Fork 0
mirror of https://github.com/gogf/gf.git synced 2025-04-05 11:18:50 +08:00
Code Issues Projects Releases Wiki Activity

util/gconv: remove unnecessary logic for function doScanList (#3588)

Browse Source
This commit is contained in:
oldme 2024-05-20 19:42:51 +08:00 committed by GitHub
parent a9a0785252
commit 737da954a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
util/gconv/gconv_scan_list.go
View File

@ -7,7 +7,6 @@
package gconv
import (
"database/sql"
"reflect"
"github.com/gogf/gf/v2/errors/gcode"
@ -115,9 +114,10 @@ func doScanList(
structSlice interface{}, structSlicePointer interface{}, bindToAttrName, relationAttrName, relationFields string,
) (err error) {
var (
maps = Maps(structSlice)
maps = Maps(structSlice)
lenMaps = len(maps)
)
if len(maps) == 0 {
if lenMaps == 0 {
return nil
}
// Necessary checks for parameters.
@ -153,19 +153,6 @@ func doScanList(
reflectKind,
)
}
length := len(maps)
if length == 0 {
// The pointed slice is not empty.
if reflectValue.Len() > 0 {
// It here checks if it has struct item, which is already initialized.
// It then returns error to warn the developer its empty and no conversion.
if v := reflectValue.Index(0); v.Kind() != reflect.Ptr {
return sql.ErrNoRows
}
}
// Do nothing for empty struct slice.
return nil
}
var (
arrayValue reflect.Value // Like: []*Entity
arrayItemType reflect.Type // Like: *Entity
@ -174,7 +161,7 @@ func doScanList(
if reflectValue.Len() > 0 {
arrayValue = reflectValue
} else {
arrayValue = reflect.MakeSlice(reflectType.Elem(), length, length)
arrayValue = reflect.MakeSlice(reflectType.Elem(), lenMaps, lenMaps)
}
// Slice element item.