gopkg/pgx
2
0
Fork 0
Code Activity

Fix: RowToStructByPos with embedded unexported struct

Browse Source 
https://github.com/jackc/pgx/issues/1583
This commit is contained in:
Jack Christensen
2023-04-27 21:02:58 -05:00
parent c27b9b49ea
commit f59e8bf555
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rows.go
+5 -7
View File
@@ -533,13 +533,11 @@ func (rs *positionalStructRowScanner) appendScanTargets(dstElemValue reflect.Val
for i := 0; i < dstElemType.NumField(); i++ {
sf := dstElemType.Field(i)
if sf.PkgPath == "" {
// Handle anonymous struct embedding, but do not try to handle embedded pointers.
if sf.Anonymous && sf.Type.Kind() == reflect.Struct {
scanTargets = rs.appendScanTargets(dstElemValue.Field(i), scanTargets)
} else {
scanTargets = append(scanTargets, dstElemValue.Field(i).Addr().Interface())
}
// Handle anonymous struct embedding, but do not try to handle embedded pointers.
if sf.Anonymous && sf.Type.Kind() == reflect.Struct {
scanTargets = rs.appendScanTargets(dstElemValue.Field(i), scanTargets)
} else if sf.PkgPath == "" {
scanTargets = append(scanTargets, dstElemValue.Field(i).Addr().Interface())
}
}