From fcd0381908d12aa41015c61f464807404e08dbe3 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Wed, 7 Jul 2021 13:22:17 +0800
Subject: [PATCH 1/2] refactor slice2Bean 2

---
 session.go | 132 +++++++----------------------------------------------
 1 file changed, 17 insertions(+), 115 deletions(-)

diff --git a/session.go b/session.go
index 3fb92991..7ee0500c 100644
--- a/session.go
+++ b/session.go
@@ -471,6 +471,7 @@ func (session *Session) convertBeanField(col *schemas.Column, fieldValue *reflec
 	}
 
 	rawValueType := reflect.TypeOf(rawValue.Interface())
+
 	vv := reflect.ValueOf(rawValue.Interface())
 
 	fieldType := fieldValue.Type()
@@ -508,6 +509,22 @@ func (session *Session) convertBeanField(col *schemas.Column, fieldValue *reflec
 	}
 
 	switch fieldType.Kind() {
+	case reflect.Ptr:
+		if scanResult == nil {
+			return nil
+		}
+		if v, ok := scanResult.(*interface{}); ok && v == nil {
+			return nil
+		}
+
+		var e reflect.Value
+		if fieldValue.IsNil() {
+			e = reflect.New(fieldType.Elem()).Elem()
+		} else {
+			e = fieldValue.Elem()
+		}
+
+		return session.convertBeanField(col, &e, scanResult, table)
 	case reflect.Complex64, reflect.Complex128:
 		// TODO: reimplement this
 		var bs []byte
@@ -702,121 +719,6 @@ func (session *Session) convertBeanField(col *schemas.Column, fieldValue *reflec
 			}
 			return nil
 		}
-	case reflect.Ptr:
-		// !nashtsai! TODO merge duplicated codes above
-		switch fieldType {
-		// following types case matching ptr's native type, therefore assign ptr directly
-		case schemas.PtrStringType:
-			if rawValueType.Kind() == reflect.String {
-				x := vv.String()
-				fieldValue.Set(reflect.ValueOf(&x))
-				return nil
-			}
-		case schemas.PtrBoolType:
-			if rawValueType.Kind() == reflect.Bool {
-				x := vv.Bool()
-				fieldValue.Set(reflect.ValueOf(&x))
-				return nil
-			}
-		case schemas.PtrTimeType:
-			if rawValueType == schemas.PtrTimeType {
-				var x = rawValue.Interface().(time.Time)
-				fieldValue.Set(reflect.ValueOf(&x))
-				return nil
-			}
-		case schemas.PtrFloat64Type:
-			if rawValueType.Kind() == reflect.Float64 {
-				x := vv.Float()
-				fieldValue.Set(reflect.ValueOf(&x))
-				return nil
-			}
-		case schemas.PtrUint64Type:
-			if rawValueType.Kind() == reflect.Int64 {
-				var x = uint64(vv.Int())
-				fieldValue.Set(reflect.ValueOf(&x))
-				return nil
-			}
-		case schemas.PtrInt64Type:
-			if rawValueType.Kind() == reflect.Int64 {
-				x := vv.Int()
-				fieldValue.Set(reflect.ValueOf(&x))
-				return nil
-			}
-		case schemas.PtrFloat32Type:
-			if rawValueType.Kind() == reflect.Float64 {
-				var x = float32(vv.Float())
-				fieldValue.Set(reflect.ValueOf(&x))
-				return nil
-			}
-		case schemas.PtrIntType:
-			if rawValueType.Kind() == reflect.Int64 {
-				var x = int(vv.Int())
-				fieldValue.Set(reflect.ValueOf(&x))
-				return nil
-			}
-		case schemas.PtrInt32Type:
-			if rawValueType.Kind() == reflect.Int64 {
-				var x = int32(vv.Int())
-				fieldValue.Set(reflect.ValueOf(&x))
-				return nil
-			}
-		case schemas.PtrInt8Type:
-			if rawValueType.Kind() == reflect.Int64 {
-				var x = int8(vv.Int())
-				fieldValue.Set(reflect.ValueOf(&x))
-				return nil
-			}
-		case schemas.PtrInt16Type:
-			if rawValueType.Kind() == reflect.Int64 {
-				var x = int16(vv.Int())
-				fieldValue.Set(reflect.ValueOf(&x))
-				return nil
-			}
-		case schemas.PtrUintType:
-			if rawValueType.Kind() == reflect.Int64 {
-				var x = uint(vv.Int())
-				fieldValue.Set(reflect.ValueOf(&x))
-				return nil
-			}
-		case schemas.PtrUint32Type:
-			if rawValueType.Kind() == reflect.Int64 {
-				var x = uint32(vv.Int())
-				fieldValue.Set(reflect.ValueOf(&x))
-				return nil
-			}
-		case schemas.Uint8Type:
-			if rawValueType.Kind() == reflect.Int64 {
-				var x = uint8(vv.Int())
-				fieldValue.Set(reflect.ValueOf(&x))
-				return nil
-			}
-		case schemas.Uint16Type:
-			if rawValueType.Kind() == reflect.Int64 {
-				var x = uint16(vv.Int())
-				fieldValue.Set(reflect.ValueOf(&x))
-				return nil
-			}
-		case schemas.Complex64Type:
-			var x complex64
-			if len([]byte(vv.String())) > 0 {
-				err := json.DefaultJSONHandler.Unmarshal([]byte(vv.String()), &x)
-				if err != nil {
-					return err
-				}
-				fieldValue.Set(reflect.ValueOf(&x))
-			}
-			return nil
-		case schemas.Complex128Type:
-			var x complex128
-			if len([]byte(vv.String())) > 0 {
-				err := json.DefaultJSONHandler.Unmarshal([]byte(vv.String()), &x)
-				if err != nil {
-					return err
-				}
-				fieldValue.Set(reflect.ValueOf(&x))
-			}
-			return nil
-		} // switch fieldType
 	} // switch fieldType.Kind()
 
 	data, err := value2Bytes(&rawValue)
-- 
2.40.1


From f14a007626f7f0b90914742b02614df4f37e98fe Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Wed, 7 Jul 2021 13:23:50 +0800
Subject: [PATCH 2/2] remove blank line

---
 session.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/session.go b/session.go
index 7ee0500c..a3b11889 100644
--- a/session.go
+++ b/session.go
@@ -471,9 +471,7 @@ func (session *Session) convertBeanField(col *schemas.Column, fieldValue *reflec
 	}
 
 	rawValueType := reflect.TypeOf(rawValue.Interface())
-
 	vv := reflect.ValueOf(rawValue.Interface())
-
 	fieldType := fieldValue.Type()
 
 	if col.IsJSON {
-- 
2.40.1