fix db.QueryStruct appending pkValues

ungerik · ungerik · commit 16fe7df987e5 · 2022-08-04T12:29:14.000+02:00
diff --git a/db/query.go b/db/query.go
@@ -64,7 +64,7 @@ func QueryValueOrDefault[T any](ctx context.Context, query string, args ...any)
 // for the passed pkValue+pkValues and a table name.
 func QueryStruct[S any](ctx context.Context, pkValue any, pkValues ...any) (row *S, err error) {
 	if len(pkValues) > 0 {
-		pkValues = append([]any{pkValues}, pkValues...)
+		pkValues = append([]any{pkValue}, pkValues...)
 	}
 	t := reflect.TypeOf(row).Elem()
 	if t.Kind() != reflect.Struct {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func QueryValueOrDefault[T any](ctx context.Context, query string, args ...any)`
`64`	`64`	`// for the passed pkValue+pkValues and a table name.`
`65`	`65`	`func QueryStruct[S any](ctx context.Context, pkValue any, pkValues ...any) (row *S, err error) {`
`66`	`66`	`if len(pkValues) > 0 {`
`67`		`- pkValues = append([]any{pkValues}, pkValues...)`
	`67`	`+ pkValues = append([]any{pkValue}, pkValues...)`
`68`	`68`	`}`
`69`	`69`	`t := reflect.TypeOf(row).Elem()`
`70`	`70`	`if t.Kind() != reflect.Struct {`