feat: rollback gofmt for scan.go

This commit is contained in:
daheige 2021-01-31 17:46:54 +08:00
parent 0df6b19a8d
commit 13076007f1

101
scan.go
View File

@ -10,24 +10,20 @@ import (
"gorm.io/gorm/schema" "gorm.io/gorm/schema"
) )
func prepareValues(values []interface{}, db *DB, func prepareValues(values []interface{}, db *DB, columnTypes []*sql.ColumnType,
columnTypes []*sql.ColumnType, columns []string) { columns []string) {
if db.Statement.Schema != nil { if db.Statement.Schema != nil {
for idx, name := range columns { for idx, name := range columns {
field := db.Statement.Schema.LookUpField(name) if field := db.Statement.Schema.LookUpField(name); field != nil {
if field != nil { values[idx] = reflect.New(reflect.PtrTo(field.FieldType)).Interface()
values[idx] = reflect.New(reflect.PtrTo(field.FieldType)).
Interface()
continue continue
} }
values[idx] = new(interface{}) values[idx] = new(interface{})
} }
} else if len(columnTypes) > 0 { } else if len(columnTypes) > 0 {
for idx, columnType := range columnTypes { for idx, columnType := range columnTypes {
if columnType.ScanType() != nil { if columnType.ScanType() != nil {
values[idx] = reflect.New(reflect.PtrTo(columnType.ScanType())). values[idx] = reflect.New(reflect.PtrTo(columnType.ScanType())).Interface()
Interface()
} else { } else {
values[idx] = new(interface{}) values[idx] = new(interface{})
} }
@ -39,14 +35,10 @@ func prepareValues(values []interface{}, db *DB,
} }
} }
func scanIntoMap(mapValue map[string]interface{}, func scanIntoMap(mapValue map[string]interface{}, values []interface{},
values []interface{}, columns []string) { columns []string) {
for idx, column := range columns { for idx, column := range columns {
reflectValue := reflect.Indirect( if reflectValue := reflect.Indirect(reflect.Indirect(reflect.ValueOf(values[idx]))); reflectValue.IsValid() {
reflect.Indirect(reflect.ValueOf(values[idx])),
)
if reflectValue.IsValid() {
mapValue[column] = reflectValue.Interface() mapValue[column] = reflectValue.Interface()
if valuer, ok := mapValue[column].(driver.Valuer); ok { if valuer, ok := mapValue[column].(driver.Valuer); ok {
mapValue[column], _ = valuer.Value() mapValue[column], _ = valuer.Value()
@ -133,30 +125,22 @@ func Scan(rows *sql.Rows, db *DB, initialized bool) {
} }
for idx, column := range columns { for idx, column := range columns {
if field := Schema.LookUpField(column); field != nil && if field := Schema.LookUpField(column); field != nil && field.Readable {
field.Readable { fields[idx] = field
} else if names := strings.Split(column, "__"); len(names) > 1 {
if rel, ok := Schema.Relationships.Relations[names[0]]; ok {
if field := rel.FieldSchema.
LookUpField(strings.Join(names[1:], "__")); field != nil && field.Readable {
fields[idx] = field fields[idx] = field
} else if names := strings.
Split(column, "__"); len(names) > 1 {
rel, ok := Schema.Relationships.Relations[names[0]]
if ok {
field2 := rel.FieldSchema.LookUpField(
strings.Join(names[1:], "__"),
)
if field2 != nil && field2.Readable {
fields[idx] = field2
if len(joinFields) == 0 { if len(joinFields) == 0 {
joinFields = make([][2]*schema.Field, joinFields = make([][2]*schema.Field, len(columns))
len(columns))
} }
joinFields[idx] = [2]*schema.Field{rel.Field, joinFields[idx] = [2]*schema.Field{rel.Field, field}
field2}
continue continue
} }
} }
values[idx] = &sql.RawBytes{} values[idx] = &sql.RawBytes{}
} else { } else {
values[idx] = &sql.RawBytes{} values[idx] = &sql.RawBytes{}
@ -167,11 +151,9 @@ func Scan(rows *sql.Rows, db *DB, initialized bool) {
// pluck values into slice of data // pluck values into slice of data
isPluck := false isPluck := false
if len(fields) == 1 { if len(fields) == 1 {
_, ok := reflect.New(reflectValueType). if _, ok := reflect.New(reflectValueType).Interface().(sql.Scanner); ok || // is scanner
Interface().(sql.Scanner) reflectValueType.Kind() != reflect.Struct || // is not struct
// is scanner or is not struct or is time Schema.ModelType.ConvertibleTo(schema.TimeReflectType) { // is time
if ok || reflectValueType.Kind() != reflect.Struct ||
Schema.ModelType.ConvertibleTo(schema.TimeReflectType) {
isPluck = true isPluck = true
} }
} }
@ -186,9 +168,7 @@ func Scan(rows *sql.Rows, db *DB, initialized bool) {
} else { } else {
for idx, field := range fields { for idx, field := range fields {
if field != nil { if field != nil {
values[idx] = reflect.New( values[idx] = reflect.New(reflect.PtrTo(field.IndirectFieldType)).Interface()
reflect.PtrTo(field.IndirectFieldType),
).Interface()
} }
} }
@ -199,14 +179,11 @@ func Scan(rows *sql.Rows, db *DB, initialized bool) {
value := reflect.ValueOf(values[idx]).Elem() value := reflect.ValueOf(values[idx]).Elem()
relValue := joinFields[idx][0].ReflectValueOf(elem) relValue := joinFields[idx][0].ReflectValueOf(elem)
if relValue.Kind() == reflect.Ptr && if relValue.Kind() == reflect.Ptr && relValue.IsNil() {
relValue.IsNil() {
if value.IsNil() { if value.IsNil() {
continue continue
} }
relValue.Set( relValue.Set(reflect.New(relValue.Type().Elem()))
reflect.New(relValue.Type().Elem()),
)
} }
field.Set(relValue, values[idx]) field.Set(relValue, values[idx])
@ -217,36 +194,24 @@ func Scan(rows *sql.Rows, db *DB, initialized bool) {
} }
if isPtr { if isPtr {
db.Statement.ReflectValue.Set(reflect. db.Statement.ReflectValue.Set(reflect.Append(db.Statement.ReflectValue, elem))
Append(db.Statement.ReflectValue, elem))
} else { } else {
db.Statement.ReflectValue.Set(reflect. db.Statement.ReflectValue.Set(reflect.Append(db.Statement.ReflectValue, elem.Elem()))
Append(db.Statement.ReflectValue, elem.Elem()))
} }
} }
case reflect.Struct, reflect.Ptr: case reflect.Struct, reflect.Ptr:
if db.Statement.ReflectValue.Type() != Schema.ModelType { if db.Statement.ReflectValue.Type() != Schema.ModelType {
Schema, _ = schema.Parse(db.Statement.Dest, db.cacheStore, Schema, _ = schema.Parse(db.Statement.Dest, db.cacheStore, db.NamingStrategy)
db.NamingStrategy)
} }
if initialized || rows.Next() { if initialized || rows.Next() {
for idx, column := range columns { for idx, column := range columns {
if field := Schema.LookUpField(column); field != nil && if field := Schema.LookUpField(column); field != nil && field.Readable {
field.Readable { values[idx] = reflect.New(reflect.PtrTo(field.IndirectFieldType)).Interface()
values[idx] = reflect.New(
reflect.PtrTo(field.IndirectFieldType),
).Interface()
} else if names := strings.Split(column, "__"); len(names) > 1 { } else if names := strings.Split(column, "__"); len(names) > 1 {
rel, ok := Schema.Relationships.Relations[names[0]] if rel, ok := Schema.Relationships.Relations[names[0]]; ok {
if ok { if field := rel.FieldSchema.LookUpField(strings.Join(names[1:], "__")); field != nil && field.Readable {
field := rel.FieldSchema. values[idx] = reflect.New(reflect.PtrTo(field.IndirectFieldType)).Interface()
LookUpField(strings.Join(names[1:], "__"))
if field != nil &&
field.Readable {
values[idx] = reflect.New(
reflect.PtrTo(field.IndirectFieldType),
).Interface()
continue continue
} }
} }
@ -260,13 +225,11 @@ func Scan(rows *sql.Rows, db *DB, initialized bool) {
db.AddError(rows.Scan(values...)) db.AddError(rows.Scan(values...))
for idx, column := range columns { for idx, column := range columns {
if field := Schema.LookUpField(column); field != nil && if field := Schema.LookUpField(column); field != nil && field.Readable {
field.Readable {
field.Set(db.Statement.ReflectValue, values[idx]) field.Set(db.Statement.ReflectValue, values[idx])
} else if names := strings.Split(column, "__"); len(names) > 1 { } else if names := strings.Split(column, "__"); len(names) > 1 {
if rel, ok := Schema.Relationships.Relations[names[0]]; ok { if rel, ok := Schema.Relationships.Relations[names[0]]; ok {
if field := rel.FieldSchema.LookUpField(strings.Join(names[1:], "__")); field != nil && if field := rel.FieldSchema.LookUpField(strings.Join(names[1:], "__")); field != nil && field.Readable {
field.Readable {
relValue := rel.Field.ReflectValueOf(db.Statement.ReflectValue) relValue := rel.Field.ReflectValueOf(db.Statement.ReflectValue)
value := reflect.ValueOf(values[idx]).Elem() value := reflect.ValueOf(values[idx]).Elem()