mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-30 08:12:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bumps our uptrace/bun dependencies to v1.2.11 (#3895)

Browse source
This commit is contained in:
kim 2025-03-10 19:40:16 +00:00 • committed by GitHub
commit bad12a62e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 60 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

10
vendor/github.com/uptrace/bun/schema/table.go generated vendored
View file

@ -171,7 +171,7 @@ func (t *Table) processFields(typ reflect.Type) {
if _, ok := ebdStructs[k]; !ok {
ebdStructs[k] = &structField{
Index: makeIndex(sf.Index, v.Index),
Table: subtable,
Table: v.Table,
}
}
}
@ -259,13 +259,13 @@ func (t *Table) processFields(typ reflect.Type) {
}
for _, embfield := range embedded {
subfield := embfield.subfield.Clone()
if ambiguousNames[subfield.Name] > 1 &&
!(!subfield.Tag.IsZero() && ambiguousTags[subfield.Name] == 1) {
if ambiguousNames[embfield.prefix+embfield.subfield.Name] > 1 &&
!(!embfield.subfield.Tag.IsZero() && ambiguousTags[embfield.prefix+embfield.subfield.Name] == 1) {
continue // ambiguous embedded field
}
subfield := embfield.subfield.Clone()
subfield.Index = makeIndex(embfield.index, subfield.Index)
if embfield.prefix != "" {
subfield.Name = embfield.prefix + subfield.Name