first pkValue arg for QueryStruct and QueryStructOrNil

Author: ungerik

db/query.go

@@ -58,13 +58,13 @@ func QueryValueOrDefault[T any](ctx context.Context, query string, args ...any)
 	return value, err
 }
 
-// QueryStruct uses the passed pkValues to query a table row
+// QueryStruct uses the passed pkValue+pkValues to query a table row
 // and scan it into a struct of type S that must have tagged fields
 // with primary key flags to identify the primary key column names
-// for the passed pkValues and a table name.
-func QueryStruct[S any](ctx context.Context, pkValues ...any) (row *S, err error) {
-	if len(pkValues) == 0 {
-		return nil, errors.New("missing primary key values")
+// 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...)
 	}
 	t := reflect.TypeOf(row).Elem()
 	if t.Kind() != reflect.Struct {
@@ -89,14 +89,14 @@ func QueryStruct[S any](ctx context.Context, pkValues ...any) (row *S, err error
 	return row, nil
 }
 
-// QueryStructOrNil uses the passed pkValues to query a table row
+// QueryStructOrNil uses the passed pkValue+pkValues to query a table row
 // and scan it into a struct of type S that must have tagged fields
 // with primary key flags to identify the primary key column names
-// for the passed pkValues and a table name.
+// for the passed pkValue+pkValues and a table name.
 // Returns nil as row and error if no row could be found with the
-// passed pkValues.
-func QueryStructOrNil[S any](ctx context.Context, pkValues ...any) (row *S, err error) {
-	row, err = QueryStruct[S](ctx, pkValues...)
+// passed pkValue+pkValues.
+func QueryStructOrNil[S any](ctx context.Context, pkValue any, pkValues ...any) (row *S, err error) {
+	row, err = QueryStruct[S](ctx, pkValue, pkValues...)
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
 			return nil, nil

go.mod

@@ -3,12 +3,12 @@ module github.com/domonda/go-sqldb
 go 1.18
 
 require (
-	github.com/domonda/go-errs v0.0.0-20220527085304-63cf6ad85d71
-	github.com/domonda/go-types v0.0.0-20220603104906-eadd2cf77191
+	github.com/domonda/go-errs v0.0.0-20220803101145-9c94ff28df79
+	github.com/domonda/go-types v0.0.0-20220803103538-ba179df4d6de
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/lib/pq v1.10.6
-	github.com/stretchr/testify v1.7.1
-	golang.org/x/exp v0.0.0-20220602145555-4a0574d9293f
+	github.com/stretchr/testify v1.8.0
+	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
 )
 
 require (

go.sum

@@ -1,12 +1,12 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/domonda/go-errs v0.0.0-20220527085304-63cf6ad85d71 h1:WRag+fUJENLRM8N/wp6gf/0i1aEkLY9prNgoFQsWeso=
-github.com/domonda/go-errs v0.0.0-20220527085304-63cf6ad85d71/go.mod h1:suiFfPp8l6I+OOaKgPK/bfX7Ci9ZtFRgPh5VNE0HPao=
+github.com/domonda/go-errs v0.0.0-20220803101145-9c94ff28df79 h1:fBQtqAIzfFx/pGWhcnask+x3OjOfJ/Io1ZY0qNEDtAQ=
+github.com/domonda/go-errs v0.0.0-20220803101145-9c94ff28df79/go.mod h1:WvIoE59Dfs0hhB2GYSlwowlBr2WWGXf/F74bg6HWUpQ=
 github.com/domonda/go-pretty v0.0.0-20220317123925-dd9e6bef129a h1:6/Is0KGl5Ot3E8ZLAgAFWYiSRdU+3t3jL38+5yIlCV4=
 github.com/domonda/go-pretty v0.0.0-20220317123925-dd9e6bef129a/go.mod h1:3QkM8UJdyJMeKZiIo7hYzSkQBpRS3k0gOHw4ysyEIB4=
-github.com/domonda/go-types v0.0.0-20220603104906-eadd2cf77191 h1:NcOIFS41zSztJog+aPw48HV8oVhRQPV0B6M6CshwFqc=
-github.com/domonda/go-types v0.0.0-20220603104906-eadd2cf77191/go.mod h1:qZTRjdjIXo3g+8PUhfpkKbMPGsLVTuF3H7/AX5CzNeQ=
+github.com/domonda/go-types v0.0.0-20220803103538-ba179df4d6de h1:JQpcRcKuUG15dmfT1LkrRgLl+wpRAvIcHLqOS6/Q2Lo=
+github.com/domonda/go-types v0.0.0-20220803103538-ba179df4d6de/go.mod h1:OBigUM85hSP8diN6QHh2PVGD0GamVO1C4TeJHWxBePA=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
@@ -21,12 +21,14 @@ github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/ungerik/go-reflection v0.0.0-20220113085621-6c5fc1f2694a h1:9vfYtqoyrPw08TbSLxkSXEflp6iXa3RL86Qjs+DrVas=
 github.com/ungerik/go-reflection v0.0.0-20220113085621-6c5fc1f2694a/go.mod h1:6Hnd2/4g3Tpt6TjvxHx8wXOZziwApVxRdIGkr7vNpXs=
-golang.org/x/exp v0.0.0-20220602145555-4a0574d9293f h1:KK6mxegmt5hGJRcAnEDjSNLxIRhZxDcgwMbcO/lMCRM=
-golang.org/x/exp v0.0.0-20220602145555-4a0574d9293f/go.mod h1:yh0Ynu2b5ZUe3MQfp2nM0ecK7wsgouWTDN0FNeJuIys=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
+golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=