From 22a26aeb18368cbe221909101a6af543351bba07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20Garcia?= Date: Sun, 16 Jul 2023 22:11:05 -0300 Subject: [PATCH] Fix tests --- benchmarks/sqlcgen/db.go | 2 +- benchmarks/sqlcgen/models.go | 2 +- benchmarks/sqlcgen/queries.sql.go | 2 +- logger.go | 21 ++++++++++++++++++--- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/benchmarks/sqlcgen/db.go b/benchmarks/sqlcgen/db.go index a118e58..7f34027 100644 --- a/benchmarks/sqlcgen/db.go +++ b/benchmarks/sqlcgen/db.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.14.0 package sqlcgen diff --git a/benchmarks/sqlcgen/models.go b/benchmarks/sqlcgen/models.go index ee1cc40..4c83f97 100644 --- a/benchmarks/sqlcgen/models.go +++ b/benchmarks/sqlcgen/models.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.14.0 package sqlcgen diff --git a/benchmarks/sqlcgen/queries.sql.go b/benchmarks/sqlcgen/queries.sql.go index cf9c18c..aba4a14 100644 --- a/benchmarks/sqlcgen/queries.sql.go +++ b/benchmarks/sqlcgen/queries.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.14.0 // source: queries.sql package sqlcgen diff --git a/logger.go b/logger.go index 629ed14..ad66c1a 100644 --- a/logger.go +++ b/logger.go @@ -45,9 +45,24 @@ type loggerKey struct{} // LogValues is the argument type of ksql.LoggerFn which contains // the data available for logging whenever a query is executed. type LogValues struct { - Query string `json:"query"` - Params []interface{} `json:"params"` - Err error `json:"error,omitempty"` + Query string + Params []interface{} + Err error +} + +func (l LogValues) MarshalJSON() ([]byte, error) { + var out struct { + Query string `json:"query"` + Params []interface{} `json:"params"` + Err string `json:"error,omitempty"` + } + + out.Query = l.Query + out.Params = l.Params + if l.Err != nil { + out.Err = l.Err.Error() + } + return json.Marshal(out) } // LoggerFn is a the type of function received as