mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-12-02 22:08:08 -06:00
[chore]: Bump github.com/uptrace/bun/dialect/sqlitedialect
Bumps [github.com/uptrace/bun/dialect/sqlitedialect](https://github.com/uptrace/bun) from 1.2.10 to 1.2.11. - [Release notes](https://github.com/uptrace/bun/releases) - [Changelog](https://github.com/uptrace/bun/blob/master/CHANGELOG.md) - [Commits](https://github.com/uptrace/bun/compare/v1.2.10...v1.2.11) --- updated-dependencies: - dependency-name: github.com/uptrace/bun/dialect/sqlitedialect dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
parent
35e94c8abd
commit
56b8579063
10 changed files with 51 additions and 36 deletions
10
vendor/github.com/uptrace/bun/schema/table.go
generated
vendored
10
vendor/github.com/uptrace/bun/schema/table.go
generated
vendored
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue