mirror of
https://github.com/superseriousbusiness/gotosocial
synced 2025-06-05 21:59:39 +02:00
[chore]: Bump github.com/jackc/pgx/v5 from 5.6.0 to 5.7.1 (#3302)
Bumps [github.com/jackc/pgx/v5](https://github.com/jackc/pgx) from 5.6.0 to 5.7.1. - [Changelog](https://github.com/jackc/pgx/blob/master/CHANGELOG.md) - [Commits](https://github.com/jackc/pgx/compare/v5.6.0...v5.7.1) --- updated-dependencies: - dependency-name: github.com/jackc/pgx/v5 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
21
vendor/github.com/jackc/pgx/v5/rows.go
generated
vendored
21
vendor/github.com/jackc/pgx/v5/rows.go
generated
vendored
@ -797,7 +797,7 @@ func computeNamedStructFields(
|
||||
if !dbTagPresent {
|
||||
colName = sf.Name
|
||||
}
|
||||
fpos := fieldPosByName(fldDescs, colName)
|
||||
fpos := fieldPosByName(fldDescs, colName, !dbTagPresent)
|
||||
if fpos == -1 {
|
||||
if missingField == "" {
|
||||
missingField = colName
|
||||
@ -816,16 +816,21 @@ func computeNamedStructFields(
|
||||
|
||||
const structTagKey = "db"
|
||||
|
||||
func fieldPosByName(fldDescs []pgconn.FieldDescription, field string) (i int) {
|
||||
func fieldPosByName(fldDescs []pgconn.FieldDescription, field string, normalize bool) (i int) {
|
||||
i = -1
|
||||
for i, desc := range fldDescs {
|
||||
|
||||
// Snake case support.
|
||||
if normalize {
|
||||
field = strings.ReplaceAll(field, "_", "")
|
||||
descName := strings.ReplaceAll(desc.Name, "_", "")
|
||||
|
||||
if strings.EqualFold(descName, field) {
|
||||
return i
|
||||
}
|
||||
for i, desc := range fldDescs {
|
||||
if normalize {
|
||||
if strings.EqualFold(strings.ReplaceAll(desc.Name, "_", ""), field) {
|
||||
return i
|
||||
}
|
||||
} else {
|
||||
if desc.Name == field {
|
||||
return i
|
||||
}
|
||||
}
|
||||
}
|
||||
return
|
||||
|
Reference in New Issue
Block a user