1
0
mirror of https://github.com/astaxie/beego.git synced 2024-12-23 07:00:49 +00:00

simplfy the code

This commit is contained in:
astaxie 2016-08-31 22:47:31 +08:00
parent 8c37a07adb
commit 56aa224a6e
2 changed files with 11 additions and 20 deletions

View File

@ -143,7 +143,7 @@ func newFieldInfo(mi *modelInfo, field reflect.Value, sf reflect.StructField, mN
var (
tag string
tagValue string
initial StrTo
initial StrTo // store the default value
fieldType int
attrs map[string]bool
tags map[string]string
@ -215,7 +215,7 @@ checkType:
}
break checkType
default:
err = fmt.Errorf("error")
err = fmt.Errorf("rel only allow these value: fk, one, m2m")
goto wrongTag
}
}
@ -235,7 +235,7 @@ checkType:
}
break checkType
default:
err = fmt.Errorf("error")
err = fmt.Errorf("reverse only allow these value: one, many")
goto wrongTag
}
}

View File

@ -70,11 +70,8 @@ func getTableEngine(val reflect.Value) string {
fun := val.MethodByName("TableEngine")
if fun.IsValid() {
vals := fun.Call([]reflect.Value{})
if len(vals) > 0 {
val := vals[0]
if val.Kind() == reflect.String {
return val.String()
}
if len(vals) > 0 && vals[0].Kind() == reflect.String {
return vals[0].String()
}
}
return ""
@ -85,12 +82,9 @@ func getTableIndex(val reflect.Value) [][]string {
fun := val.MethodByName("TableIndex")
if fun.IsValid() {
vals := fun.Call([]reflect.Value{})
if len(vals) > 0 {
val := vals[0]
if val.CanInterface() {
if d, ok := val.Interface().([][]string); ok {
return d
}
if len(vals) > 0 && vals[0].CanInterface() {
if d, ok := vals[0].Interface().([][]string); ok {
return d
}
}
}
@ -102,12 +96,9 @@ func getTableUnique(val reflect.Value) [][]string {
fun := val.MethodByName("TableUnique")
if fun.IsValid() {
vals := fun.Call([]reflect.Value{})
if len(vals) > 0 {
val := vals[0]
if val.CanInterface() {
if d, ok := val.Interface().([][]string); ok {
return d
}
if len(vals) > 0 && vals[0].CanInterface() {
if d, ok := vals[0].Interface().([][]string); ok {
return d
}
}
}