GOMODULES
/
pgx
mirror of https://github.com/jackc/pgx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

in rows.go 'fieldPosByName' use boolean to replace '_' and only execution replacements when there are no db tags present

pull/2085/head
nolandseigler 2024-07-11 23:28:21 -04:00
parent 7a35585143
commit 7fceb64dee
No known key found for this signature in database
GPG Key ID: E40C7025309EA201
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rows.go
View File

@ -797,7 +797,7 @@ func computeNamedStructFields(
if !dbTagPresent { if !dbTagPresent {
colName = sf.Name colName = sf.Name
} }
fpos := fieldPosByName(fldDescs, colName) fpos := fieldPosByName(fldDescs, colName, !dbTagPresent)
if fpos == -1 { if fpos == -1 {
if missingField == "" { if missingField == "" {
missingField = colName missingField = colName
@ -816,13 +816,18 @@ func computeNamedStructFields(
const structTagKey = "db" const structTagKey = "db"
func fieldPosByName(fldDescs []pgconn.FieldDescription, field string) (i int) { func fieldPosByName(fldDescs []pgconn.FieldDescription, field string, replace bool) (i int) {
i = -1 i = -1
if replace {
field = strings.ReplaceAll(field, "_", "")
}
for i, desc := range fldDescs { for i, desc := range fldDescs {
// Snake case support. // Snake case support.
field = strings.ReplaceAll(field, "_", "") descName := desc.Name
descName := strings.ReplaceAll(desc.Name, "_", "") if replace {
descName = strings.ReplaceAll(desc.Name, "_", "")
}
if strings.EqualFold(descName, field) { if strings.EqualFold(descName, field) {
return i return i
@ -848,4 +853,4 @@ func setupStructScanTargets(receiver any, fields []structRowField) []any {
scanTargets[i] = v.FieldByIndex(f.path).Addr().Interface() scanTargets[i] = v.FieldByIndex(f.path).Addr().Interface()
} }
return scanTargets return scanTargets
} }

4
rows_test.go
View File

@ -693,7 +693,7 @@ func TestRowToStructByNameDbTags(t *testing.T) {
// check missing fields in a returned row // check missing fields in a returned row
rows, _ = conn.Query(ctx, `select 'Smith' as last_name, n as age from generate_series(0, 9) n`) rows, _ = conn.Query(ctx, `select 'Smith' as last_name, n as age from generate_series(0, 9) n`)
_, err = pgx.CollectRows(rows, pgx.RowToStructByName[person]) _, err = pgx.CollectRows(rows, pgx.RowToStructByName[person])
assert.ErrorContains(t, err, "cannot find field First in returned row") assert.ErrorContains(t, err, "cannot find field first_name in returned row")
// check missing field in a destination struct // check missing field in a destination struct
rows, _ = conn.Query(ctx, `select 'John' as first_name, 'Smith' as last_name, n as age, 'd5e49d3f' as account_id, '5e49d321' as account__id, null as ignore from generate_series(0, 9) n`) rows, _ = conn.Query(ctx, `select 'John' as first_name, 'Smith' as last_name, n as age, 'd5e49d3f' as account_id, '5e49d321' as account__id, null as ignore from generate_series(0, 9) n`)
@ -992,4 +992,4 @@ insert into products (name, price) values
// Cheeseburger: $10 // Cheeseburger: $10
// Fries: $5 // Fries: $5
// Soft Drink: $3 // Soft Drink: $3
} }