bug fixed for json unmarshal

.gitignore

@@ -26,3 +26,4 @@ vendor
 *.log
 .vendor
 temp_test.go
+.vscode

VERSION

@@ -1 +1 @@
-xorm v0.5.4.0508
+xorm v0.5.4.0513

session.go

@@ -1574,7 +1574,7 @@ func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount
 		if fieldValue := session.getField(dataStruct, key, table, idx); fieldValue != nil {
 			rawValue := reflect.Indirect(reflect.ValueOf(scanResults[ii]))
 
-			//if row is null then ignore
+			// if row is null then ignore
 			if rawValue.Interface() == nil {
 				continue
 			}
@@ -1621,6 +1621,7 @@ func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount
 
 				hasAssigned = true
 
+				if len(bs) > 0 {
 					if fieldValue.CanAddr() {
 						err := json.Unmarshal(bs, fieldValue.Addr().Interface())
 						if err != nil {
@@ -1636,6 +1637,7 @@ func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount
 						}
 						fieldValue.Set(x.Elem())
 					}
+				}
 
 				continue
 			}
@@ -1651,6 +1653,7 @@ func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount
 				}
 
 				hasAssigned = true
+				if len(bs) > 0 {
 					if fieldValue.CanAddr() {
 						err := json.Unmarshal(bs, fieldValue.Addr().Interface())
 						if err != nil {
@@ -1666,6 +1669,7 @@ func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount
 						}
 						fieldValue.Set(x.Elem())
 					}
+				}
 			case reflect.Slice, reflect.Array:
 				switch rawValueType.Kind() {
 				case reflect.Slice, reflect.Array:
@@ -1778,15 +1782,18 @@ func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount
 					if rawValueType.Kind() == reflect.String {
 						hasAssigned = true
 						x := reflect.New(fieldType)
+						if len([]byte(vv.String())) > 0 {
 							err := json.Unmarshal([]byte(vv.String()), x.Interface())
 							if err != nil {
 								session.Engine.logger.Error(err)
 								return err
 							}
 							fieldValue.Set(x.Elem())
+						}
 					} else if rawValueType.Kind() == reflect.Slice {
 						hasAssigned = true
 						x := reflect.New(fieldType)
+						if len(vv.Bytes()) > 0 {
 							err := json.Unmarshal(vv.Bytes(), x.Interface())
 							if err != nil {
 								session.Engine.logger.Error(err)
@@ -1794,6 +1801,7 @@ func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount
 							}
 							fieldValue.Set(x.Elem())
 						}
+					}
 				} else if session.Statement.UseCascade {
 					table := session.Engine.autoMapType(*fieldValue)
 					if table != nil {
@@ -1950,21 +1958,25 @@ func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount
 					}
 				case core.Complex64Type:
 					var x complex64
+					if len([]byte(vv.String())) > 0 {
 						err := json.Unmarshal([]byte(vv.String()), &x)
 						if err != nil {
 							session.Engine.logger.Error(err)
 						} else {
 							fieldValue.Set(reflect.ValueOf(&x))
 						}
+					}
 					hasAssigned = true
 				case core.Complex128Type:
 					var x complex128
+					if len([]byte(vv.String())) > 0 {
 						err := json.Unmarshal([]byte(vv.String()), &x)
 						if err != nil {
 							session.Engine.logger.Error(err)
 						} else {
 							fieldValue.Set(reflect.ValueOf(&x))
 						}
+					}
 					hasAssigned = true
 				} // switch fieldType
 				// default:
@@ -2408,30 +2420,34 @@ func (session *Session) bytes2Value(col *core.Column, fieldValue *reflect.Value,
 	switch fieldType.Kind() {
 	case reflect.Complex64, reflect.Complex128:
 		x := reflect.New(fieldType)
-
+		if len(data) > 0 {
 			err := json.Unmarshal(data, x.Interface())
 			if err != nil {
 				session.Engine.logger.Error(err)
 				return err
 			}
 			fieldValue.Set(x.Elem())
+		}
 	case reflect.Slice, reflect.Array, reflect.Map:
 		v = data
 		t := fieldType.Elem()
 		k := t.Kind()
 		if col.SQLType.IsText() {
 			x := reflect.New(fieldType)
+			if len(data) > 0 {
 				err := json.Unmarshal(data, x.Interface())
 				if err != nil {
 					session.Engine.logger.Error(err)
 					return err
 				}
 				fieldValue.Set(x.Elem())
+			}
 		} else if col.SQLType.IsBlob() {
 			if k == reflect.Uint8 {
 				fieldValue.Set(reflect.ValueOf(v))
 			} else {
 				x := reflect.New(fieldType)
+				if len(data) > 0 {
 					err := json.Unmarshal(data, x.Interface())
 					if err != nil {
 						session.Engine.logger.Error(err)
@@ -2439,6 +2455,7 @@ func (session *Session) bytes2Value(col *core.Column, fieldValue *reflect.Value,
 					}
 					fieldValue.Set(x.Elem())
 				}
+			}
 		} else {
 			return ErrUnSupportedType
 		}
@@ -2562,21 +2579,25 @@ func (session *Session) bytes2Value(col *core.Column, fieldValue *reflect.Value,
 		// case "*complex64":
 		case core.Complex64Type.Kind():
 			var x complex64
+			if len(data) > 0 {
 				err := json.Unmarshal(data, &x)
 				if err != nil {
 					session.Engine.logger.Error(err)
 					return err
 				}
 				fieldValue.Set(reflect.ValueOf(&x).Convert(fieldType))
+			}
 		// case "*complex128":
 		case core.Complex128Type.Kind():
 			var x complex128
+			if len(data) > 0 {
 				err := json.Unmarshal(data, &x)
 				if err != nil {
 					session.Engine.logger.Error(err)
 					return err
 				}
 				fieldValue.Set(reflect.ValueOf(&x).Convert(fieldType))
+			}
 		// case "*float64":
 		case core.Float64Type.Kind():
 			x, err := strconv.ParseFloat(string(data), 64)

xorm.go

@@ -17,7 +17,7 @@ import (
 
 const (
 	// Version show the xorm's version
-	Version string = "0.5.4.0508"
+	Version string = "0.5.4.0513"
 )
 
 func regDrvsNDialects() bool {