Skip to content

Commit 9f27377

Browse files
authored
fix deprecated reflect.PtrTo reflect.PointerTo usage (#7366)
* fix deprecated reflect.PtrTo reflect.PointerTo usage * replace all deprecated reflect.PtrTo reflect.PointerTo usage
1 parent 9ca84b3 commit 9f27377

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

callbacks/associations.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func SaveBeforeAssociations(create bool) func(db *gorm.DB) {
4747
)
4848

4949
if !isPtr {
50-
fieldType = reflect.PtrTo(fieldType)
50+
fieldType = reflect.PointerTo(fieldType)
5151
}
5252

5353
elems := reflect.MakeSlice(reflect.SliceOf(fieldType), 0, 10)
@@ -126,7 +126,7 @@ func SaveAfterAssociations(create bool) func(db *gorm.DB) {
126126
)
127127

128128
if !isPtr {
129-
fieldType = reflect.PtrTo(fieldType)
129+
fieldType = reflect.PointerTo(fieldType)
130130
}
131131

132132
elems := reflect.MakeSlice(reflect.SliceOf(fieldType), 0, 10)
@@ -195,7 +195,7 @@ func SaveAfterAssociations(create bool) func(db *gorm.DB) {
195195
fieldType := rel.Field.IndirectFieldType.Elem()
196196
isPtr := fieldType.Kind() == reflect.Ptr
197197
if !isPtr {
198-
fieldType = reflect.PtrTo(fieldType)
198+
fieldType = reflect.PointerTo(fieldType)
199199
}
200200
elems := reflect.MakeSlice(reflect.SliceOf(fieldType), 0, 10)
201201
identityMap := map[string]bool{}
@@ -268,11 +268,11 @@ func SaveAfterAssociations(create bool) func(db *gorm.DB) {
268268
fieldType := rel.Field.IndirectFieldType.Elem()
269269
isPtr := fieldType.Kind() == reflect.Ptr
270270
if !isPtr {
271-
fieldType = reflect.PtrTo(fieldType)
271+
fieldType = reflect.PointerTo(fieldType)
272272
}
273273
elems := reflect.MakeSlice(reflect.SliceOf(fieldType), 0, 10)
274274
distinctElems := reflect.MakeSlice(reflect.SliceOf(fieldType), 0, 10)
275-
joins := reflect.MakeSlice(reflect.SliceOf(reflect.PtrTo(rel.JoinTable.ModelType)), 0, 10)
275+
joins := reflect.MakeSlice(reflect.SliceOf(reflect.PointerTo(rel.JoinTable.ModelType)), 0, 10)
276276
objs := []reflect.Value{}
277277

278278
appendToJoins := func(obj reflect.Value, elem reflect.Value) {

scan.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ func prepareValues(values []interface{}, db *DB, columnTypes []*sql.ColumnType,
1515
if db.Statement.Schema != nil {
1616
for idx, name := range columns {
1717
if field := db.Statement.Schema.LookUpField(name); field != nil {
18-
values[idx] = reflect.New(reflect.PtrTo(field.FieldType)).Interface()
18+
values[idx] = reflect.New(reflect.PointerTo(field.FieldType)).Interface()
1919
continue
2020
}
2121
values[idx] = new(interface{})
2222
}
2323
} else if len(columnTypes) > 0 {
2424
for idx, columnType := range columnTypes {
2525
if columnType.ScanType() != nil {
26-
values[idx] = reflect.New(reflect.PtrTo(columnType.ScanType())).Interface()
26+
values[idx] = reflect.New(reflect.PointerTo(columnType.ScanType())).Interface()
2727
} else {
2828
values[idx] = new(interface{})
2929
}

schema/field.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -996,6 +996,6 @@ func (field *Field) setupNewValuePool() {
996996
}
997997

998998
if field.NewValuePool == nil {
999-
field.NewValuePool = poolInitializer(reflect.PtrTo(field.IndirectFieldType))
999+
field.NewValuePool = poolInitializer(reflect.PointerTo(field.IndirectFieldType))
10001000
}
10011001
}

schema/utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func appendSettingFromTag(tag reflect.StructTag, value string) reflect.StructTag
7171
// GetRelationsValues get relations's values from a reflect value
7272
func GetRelationsValues(ctx context.Context, reflectValue reflect.Value, rels []*Relationship) (reflectResults reflect.Value) {
7373
for _, rel := range rels {
74-
reflectResults = reflect.MakeSlice(reflect.SliceOf(reflect.PtrTo(rel.FieldSchema.ModelType)), 0, 1)
74+
reflectResults = reflect.MakeSlice(reflect.SliceOf(reflect.PointerTo(rel.FieldSchema.ModelType)), 0, 1)
7575

7676
appendToResults := func(value reflect.Value) {
7777
if _, isZero := rel.Field.ValueOf(ctx, value); !isZero {

0 commit comments

Comments
 (0)