diff --git a/go.mod b/go.mod index ef8ec524..45306b5a 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( golang.org/x/sync v0.17.0 gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 - gorm.io/datatypes v1.2.6 + gorm.io/datatypes v1.2.7 gorm.io/driver/mysql v1.6.0 gorm.io/driver/sqlite v1.6.0 gorm.io/gorm v1.31.0 diff --git a/go.sum b/go.sum index e7b186dc..4066cc72 100644 --- a/go.sum +++ b/go.sum @@ -265,8 +265,8 @@ gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/datatypes v1.2.6 h1:KafLdXvFUhzNeL2ncm03Gl3eTLONQfNKZ+wJ+9Y4Nck= -gorm.io/datatypes v1.2.6/go.mod h1:M2iO+6S3hhi4nAyYe444Pcb0dcIiOMJ7QHaUXxyiNZY= +gorm.io/datatypes v1.2.7 h1:ww9GAhF1aGXZY3EB3cJPJ7//JiuQo7DlQA7NNlVaTdk= +gorm.io/datatypes v1.2.7/go.mod h1:M2iO+6S3hhi4nAyYe444Pcb0dcIiOMJ7QHaUXxyiNZY= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= gorm.io/driver/postgres v1.5.0 h1:u2FXTy14l45qc3UeCJ7QaAXZmZfDDv0YrthvmRq1l0U= diff --git a/vendor/gorm.io/datatypes/json_type.go b/vendor/gorm.io/datatypes/json_type.go index 72729bff..e7f5cc2f 100644 --- a/vendor/gorm.io/datatypes/json_type.go +++ b/vendor/gorm.io/datatypes/json_type.go @@ -32,7 +32,11 @@ func (j JSONType[T]) Data() T { // Value return json value, implement driver.Valuer interface func (j JSONType[T]) Value() (driver.Value, error) { - return json.Marshal(j.data) + data, err := json.Marshal(j.data) + if err != nil { + return nil, err + } + return string(data), nil } // Scan scan value into JSONType[T], implements sql.Scanner interface @@ -99,7 +103,11 @@ func NewJSONSlice[T any](s []T) JSONSlice[T] { // Value return json value, implement driver.Valuer interface func (j JSONSlice[T]) Value() (driver.Value, error) { - return json.Marshal(j) + data, err := json.Marshal(j) + if err != nil { + return nil, err + } + return string(data), nil } // Scan scan value into JSONType[T], implements sql.Scanner interface diff --git a/vendor/modules.txt b/vendor/modules.txt index e9dde212..0c603c38 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -432,7 +432,7 @@ gopkg.in/natefinch/lumberjack.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# gorm.io/datatypes v1.2.6 +# gorm.io/datatypes v1.2.7 ## explicit; go 1.19 gorm.io/datatypes # gorm.io/driver/mysql v1.6.0