diff options
| author | 2021-11-13 12:29:08 +0100 | |
|---|---|---|
| committer | 2021-11-13 12:29:08 +0100 | |
| commit | 829a934d23ab221049b4d54926305d8d5d64c9ad (patch) | |
| tree | f4e382b289c113d3ba8a3c7a183507a5609c46c0 /vendor/github.com/uptrace/bun/dialect/pgdialect | |
| parent | smtp + email confirmation (#285) (diff) | |
| download | gotosocial-829a934d23ab221049b4d54926305d8d5d64c9ad.tar.xz | |
update dependencies (#296)
Diffstat (limited to 'vendor/github.com/uptrace/bun/dialect/pgdialect')
| -rw-r--r-- | vendor/github.com/uptrace/bun/dialect/pgdialect/dialect.go | 3 | ||||
| -rw-r--r-- | vendor/github.com/uptrace/bun/dialect/pgdialect/sqltype.go | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/vendor/github.com/uptrace/bun/dialect/pgdialect/dialect.go b/vendor/github.com/uptrace/bun/dialect/pgdialect/dialect.go index bac38972f..aba82eac1 100644 --- a/vendor/github.com/uptrace/bun/dialect/pgdialect/dialect.go +++ b/vendor/github.com/uptrace/bun/dialect/pgdialect/dialect.go @@ -3,6 +3,7 @@ package pgdialect import ( "database/sql" "strconv" + "strings" "github.com/uptrace/bun/dialect" "github.com/uptrace/bun/dialect/feature" @@ -68,7 +69,7 @@ func (d *Dialect) onField(field *schema.Field) { } } - if field.Tag.HasOption("array") { + if field.Tag.HasOption("array") || strings.HasSuffix(field.UserSQLType, "[]") { field.Append = d.arrayAppender(field.StructField.Type) field.Scan = arrayScanner(field.StructField.Type) } diff --git a/vendor/github.com/uptrace/bun/dialect/pgdialect/sqltype.go b/vendor/github.com/uptrace/bun/dialect/pgdialect/sqltype.go index dab0446ed..1fbfa7d7f 100644 --- a/vendor/github.com/uptrace/bun/dialect/pgdialect/sqltype.go +++ b/vendor/github.com/uptrace/bun/dialect/pgdialect/sqltype.go @@ -4,7 +4,6 @@ import ( "encoding/json" "net" "reflect" - "time" "github.com/uptrace/bun/dialect/sqltype" "github.com/uptrace/bun/schema" @@ -41,7 +40,6 @@ const ( ) var ( - timeType = reflect.TypeOf((*time.Time)(nil)).Elem() ipType = reflect.TypeOf((*net.IP)(nil)).Elem() ipNetType = reflect.TypeOf((*net.IPNet)(nil)).Elem() jsonRawMessageType = reflect.TypeOf((*json.RawMessage)(nil)).Elem() @@ -52,11 +50,11 @@ func fieldSQLType(field *schema.Field) string { return field.UserSQLType } - if v, ok := field.Tag.Options["composite"]; ok { + if v, ok := field.Tag.Option("composite"); ok { return v } - if _, ok := field.Tag.Options["hstore"]; ok { + if _, ok := field.Tag.Option("hstore"); ok { return "hstore" } |
