mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-12-30 05:36:15 -06:00
update bun library to latest commit
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
This commit is contained in:
parent
64bd689e55
commit
f1e9f21dff
6 changed files with 20 additions and 13 deletions
11
vendor/github.com/uptrace/bun/query_table_create.go
generated
vendored
11
vendor/github.com/uptrace/bun/query_table_create.go
generated
vendored
|
|
@ -186,14 +186,20 @@ func (q *CreateTableQuery) appendUniqueConstraints(fmter schema.Formatter, b []b
|
|||
sort.Strings(keys)
|
||||
|
||||
for _, key := range keys {
|
||||
b = q.appendUniqueConstraint(fmter, b, key, unique[key])
|
||||
if key == "" {
|
||||
for _, field := range unique[key] {
|
||||
b = q.appendUniqueConstraint(fmter, b, key, field)
|
||||
}
|
||||
continue
|
||||
}
|
||||
b = q.appendUniqueConstraint(fmter, b, key, unique[key]...)
|
||||
}
|
||||
|
||||
return b
|
||||
}
|
||||
|
||||
func (q *CreateTableQuery) appendUniqueConstraint(
|
||||
fmter schema.Formatter, b []byte, name string, fields []*schema.Field,
|
||||
fmter schema.Formatter, b []byte, name string, fields ...*schema.Field,
|
||||
) []byte {
|
||||
if name != "" {
|
||||
b = append(b, ", CONSTRAINT "...)
|
||||
|
|
@ -204,7 +210,6 @@ func (q *CreateTableQuery) appendUniqueConstraint(
|
|||
b = append(b, " UNIQUE ("...)
|
||||
b = appendColumns(b, "", fields)
|
||||
b = append(b, ")"...)
|
||||
|
||||
return b
|
||||
}
|
||||
|
||||
|
|
|
|||
11
vendor/github.com/uptrace/bun/schema/table.go
generated
vendored
11
vendor/github.com/uptrace/bun/schema/table.go
generated
vendored
|
|
@ -193,10 +193,15 @@ func (t *Table) initFields() {
|
|||
}
|
||||
}
|
||||
if len(t.PKs) == 1 {
|
||||
switch t.PKs[0].IndirectType.Kind() {
|
||||
pk := t.PKs[0]
|
||||
if pk.SQLDefault != "" {
|
||||
return
|
||||
}
|
||||
|
||||
switch pk.IndirectType.Kind() {
|
||||
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
|
||||
reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
|
||||
t.PKs[0].AutoIncrement = true
|
||||
pk.AutoIncrement = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -359,7 +364,7 @@ func (t *Table) newField(f reflect.StructField, index []int) *Field {
|
|||
field.DiscoveredSQLType = DiscoverSQLType(field.IndirectType)
|
||||
field.Append = t.dialect.FieldAppender(field)
|
||||
field.Scan = FieldScanner(t.dialect, field)
|
||||
field.IsZero = FieldZeroChecker(field)
|
||||
field.IsZero = zeroChecker(field.StructField.Type)
|
||||
|
||||
if v, ok := tag.Options["alt"]; ok {
|
||||
t.FieldMap[v] = field
|
||||
|
|
|
|||
4
vendor/github.com/uptrace/bun/schema/zerochecker.go
generated
vendored
4
vendor/github.com/uptrace/bun/schema/zerochecker.go
generated
vendored
|
|
@ -13,10 +13,6 @@ type isZeroer interface {
|
|||
|
||||
type IsZeroerFunc func(reflect.Value) bool
|
||||
|
||||
func FieldZeroChecker(field *Field) IsZeroerFunc {
|
||||
return zeroChecker(field.IndirectType)
|
||||
}
|
||||
|
||||
func zeroChecker(typ reflect.Type) IsZeroerFunc {
|
||||
if typ.Implements(isZeroerType) {
|
||||
return isZeroInterface
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue