diff options
Diffstat (limited to 'vendor/github.com')
6 files changed, 20 insertions, 34 deletions
diff --git a/vendor/github.com/uptrace/bun/CHANGELOG.md b/vendor/github.com/uptrace/bun/CHANGELOG.md index f1d9577c3..8a95c45dc 100644 --- a/vendor/github.com/uptrace/bun/CHANGELOG.md +++ b/vendor/github.com/uptrace/bun/CHANGELOG.md @@ -1,3 +1,12 @@ +## [1.1.16](https://github.com/uptrace/bun/compare/v1.1.15...v1.1.16) (2023-09-16) + + +### Reverts + +* Revert "fix: "model does not have column" error (#850)" ([387228e](https://github.com/uptrace/bun/commit/387228e85d22dfcf3659f4631dfa87106d7ef45f)), closes [#850](https://github.com/uptrace/bun/issues/850) + + + ## [1.1.15](https://github.com/uptrace/bun/compare/v1.1.14...v1.1.15) (2023-09-10) diff --git a/vendor/github.com/uptrace/bun/dialect/pgdialect/version.go b/vendor/github.com/uptrace/bun/dialect/pgdialect/version.go index bea5c4d2d..9b3f8e228 100644 --- a/vendor/github.com/uptrace/bun/dialect/pgdialect/version.go +++ b/vendor/github.com/uptrace/bun/dialect/pgdialect/version.go @@ -2,5 +2,5 @@ package pgdialect // Version is the current release version. func Version() string { - return "1.1.15" + return "1.1.16" } diff --git a/vendor/github.com/uptrace/bun/dialect/sqlitedialect/version.go b/vendor/github.com/uptrace/bun/dialect/sqlitedialect/version.go index 4fbb58cee..8baf8191f 100644 --- a/vendor/github.com/uptrace/bun/dialect/sqlitedialect/version.go +++ b/vendor/github.com/uptrace/bun/dialect/sqlitedialect/version.go @@ -2,5 +2,5 @@ package sqlitedialect // Version is the current release version. func Version() string { - return "1.1.15" + return "1.1.16" } diff --git a/vendor/github.com/uptrace/bun/package.json b/vendor/github.com/uptrace/bun/package.json index b4c8d6ca6..ad384286b 100644 --- a/vendor/github.com/uptrace/bun/package.json +++ b/vendor/github.com/uptrace/bun/package.json @@ -1,6 +1,6 @@ { "name": "gobun", - "version": "1.1.15", + "version": "1.1.16", "main": "index.js", "repository": "git@github.com:uptrace/bun.git", "author": "Vladimir Mihailenco <vladimir.webdev@gmail.com>", diff --git a/vendor/github.com/uptrace/bun/schema/table.go b/vendor/github.com/uptrace/bun/schema/table.go index cd0ff20b2..9eb7d1bfe 100644 --- a/vendor/github.com/uptrace/bun/schema/table.go +++ b/vendor/github.com/uptrace/bun/schema/table.go @@ -4,7 +4,6 @@ import ( "database/sql" "fmt" "reflect" - "strconv" "strings" "sync" "time" @@ -807,38 +806,18 @@ func (t *Table) m2mRelation(field *Field) *Relation { return rel } -type seenKey struct { - Table reflect.Type - FieldIndex string -} - -type seenMap map[seenKey]struct{} - -func NewSeenKey(table reflect.Type, fieldIndex []int) (key seenKey) { - key.Table = table - for _, index := range fieldIndex { - key.FieldIndex += strconv.Itoa(index) + "-" - } - return key -} - -func (s seenMap) Clone() seenMap { - t := make(seenMap) - for k, v := range s { - t[k] = v +func (t *Table) inlineFields(field *Field, seen map[reflect.Type]struct{}) { + if seen == nil { + seen = map[reflect.Type]struct{}{t.Type: {}} } - return t -} -func (t *Table) inlineFields(field *Field, seen seenMap) { - if seen == nil { - seen = make(seenMap) + if _, ok := seen[field.IndirectType]; ok { + return } + seen[field.IndirectType] = struct{}{} joinTable := t.dialect.Tables().Ref(field.IndirectType) for _, f := range joinTable.allFields { - key := NewSeenKey(joinTable.Type, f.Index) - f = f.Clone() f.GoName = field.GoName + "_" + f.GoName f.Name = field.Name + "__" + f.Name @@ -855,9 +834,7 @@ func (t *Table) inlineFields(field *Field, seen seenMap) { continue } - if _, ok := seen[key]; !ok { - seen = seen.Clone() - seen[key] = struct{}{} + if _, ok := seen[f.IndirectType]; !ok { t.inlineFields(f, seen) } } diff --git a/vendor/github.com/uptrace/bun/version.go b/vendor/github.com/uptrace/bun/version.go index 371014de7..641a29074 100644 --- a/vendor/github.com/uptrace/bun/version.go +++ b/vendor/github.com/uptrace/bun/version.go @@ -2,5 +2,5 @@ package bun // Version is the current release version. func Version() string { - return "1.1.15" + return "1.1.16" } |