From 72e580c566d783cc0c42bacb183c4abb5ab85a87 Mon Sep 17 00:00:00 2001 From: henryjcee Date: Tue, 8 Oct 2024 17:55:24 +0100 Subject: [PATCH] Partially revert the change made in https://github.com/go-gorm/gorm/pull/6311 that appears to have broken this for us and at least one other person. --- schema/field.go | 3 ++- tests/go.mod | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/schema/field.go b/schema/field.go index a16c98ab..bdc0b761 100644 --- a/schema/field.go +++ b/schema/field.go @@ -12,6 +12,7 @@ import ( "time" "github.com/jinzhu/now" + "gorm.io/gorm/clause" "gorm.io/gorm/utils" ) @@ -922,7 +923,7 @@ func (field *Field) setupValuerAndSetter() { if !reflectV.IsValid() { field.ReflectValueOf(ctx, value).Set(reflect.New(field.FieldType).Elem()) } else if reflectV.Kind() == reflect.Ptr && reflectV.IsNil() { - return + field.ReflectValueOf(ctx, value).Set(reflect.New(field.FieldType).Elem()) } else if reflectV.Type().AssignableTo(field.FieldType) { field.ReflectValueOf(ctx, value).Set(reflectV) } else if reflectV.Kind() == reflect.Ptr { diff --git a/tests/go.mod b/tests/go.mod index 44535b03..db1d067c 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -1,6 +1,8 @@ module gorm.io/gorm/tests -go 1.18 +go 1.21 + +toolchain go1.23.2 require ( github.com/google/uuid v1.6.0