From a156188b3eb5cb3da44aa1b7452265f5fa38a607 Mon Sep 17 00:00:00 2001
From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>
Date: Wed, 28 Sep 2022 18:30:40 +0100
Subject: [chore] update dependencies, bump to Go 1.19.1 (#826)

* update dependencies, bump Go version to 1.19

* bump test image Go version

* update golangci-lint

* update gotosocial-drone-build

* sign

* linting, go fmt

* update swagger docs

* update swagger docs

* whitespace

* update contributing.md

* fuckin whoopsie doopsie

* linterino, linteroni

* fix followrequest test not starting processor

* fix other api/client tests not starting processor

* fix remaining tests where processor not started

* bump go-runners version

* don't check last-webfingered-at, processor may have updated this

* update swagger command

* update bun to latest version

* fix embed to work the same as before with new bun

Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
---
 vendor/github.com/uptrace/bun/schema/append_value.go | 3 +++
 vendor/github.com/uptrace/bun/schema/table.go        | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'vendor/github.com/uptrace/bun/schema')

diff --git a/vendor/github.com/uptrace/bun/schema/append_value.go b/vendor/github.com/uptrace/bun/schema/append_value.go
index 7e9c451db..93c892082 100644
--- a/vendor/github.com/uptrace/bun/schema/append_value.go
+++ b/vendor/github.com/uptrace/bun/schema/append_value.go
@@ -274,6 +274,9 @@ func appendDriverValue(fmter Formatter, b []byte, v reflect.Value) []byte {
 	if err != nil {
 		return dialect.AppendError(b, err)
 	}
+	if _, ok := value.(driver.Valuer); ok {
+		return dialect.AppendError(b, fmt.Errorf("driver.Valuer returns unsupported type %T", value))
+	}
 	return Append(fmter, b, value)
 }
 
diff --git a/vendor/github.com/uptrace/bun/schema/table.go b/vendor/github.com/uptrace/bun/schema/table.go
index 9791f8ff1..ed8c517c1 100644
--- a/vendor/github.com/uptrace/bun/schema/table.go
+++ b/vendor/github.com/uptrace/bun/schema/table.go
@@ -287,17 +287,17 @@ func (t *Table) processBaseModelField(f reflect.StructField) {
 	}
 }
 
-//nolint
+// nolint
 func (t *Table) newField(f reflect.StructField, prefix string, index []int) *Field {
 	tag := tagparser.Parse(f.Tag.Get("bun"))
 
-	if prefix, ok := tag.Option("embed"); ok {
+	if nextPrefix, ok := tag.Option("embed"); ok {
 		fieldType := indirectType(f.Type)
 		if fieldType.Kind() != reflect.Struct {
 			panic(fmt.Errorf("bun: embed %s.%s: got %s, wanted reflect.Struct",
 				t.TypeName, f.Name, fieldType.Kind()))
 		}
-		t.addFields(fieldType, prefix, withIndex(index, f.Index))
+		t.addFields(fieldType, prefix+nextPrefix, withIndex(index, f.Index))
 		return nil
 	}
 
-- 
cgit v1.3