HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support Find(struct1, struct2), param1 is different from param2

This commit is contained in:
Lunny Xiao 2014-11-22 12:23:31 +08:00
parent 8552a6e846
commit a949e067ce
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
column.go
View File

@ -1,6 +1,7 @@
package core package core
import ( import (
"errors"
"fmt" "fmt"
"reflect" "reflect"
"strings" "strings"
@ -116,7 +117,6 @@ func (col *Column) ValueOf(bean interface{}) (*reflect.Value, error) {
func (col *Column) ValueOfV(dataStruct *reflect.Value) (*reflect.Value, error) { func (col *Column) ValueOfV(dataStruct *reflect.Value) (*reflect.Value, error) {
var fieldValue reflect.Value var fieldValue reflect.Value
var err error
if col.fieldPath == nil { if col.fieldPath == nil {
col.fieldPath = strings.Split(col.FieldName, ".") col.fieldPath = strings.Split(col.FieldName, ".")
} }
@ -137,18 +137,21 @@ func (col *Column) ValueOfV(dataStruct *reflect.Value) (*reflect.Value, error) {
if parentField.IsValid() { if parentField.IsValid() {
fieldValue = parentField.FieldByName(col.fieldPath[1]) fieldValue = parentField.FieldByName(col.fieldPath[1])
} else { } else {
err = fmt.Errorf("field %v is not valid", col.FieldName) return nil, fmt.Errorf("field %v is not valid", col.FieldName)
} }
} }
} }
} else { } else {
err = fmt.Errorf("field %v is not valid", col.FieldName) // so we can use a different struct as conditions
fieldValue = dataStruct.FieldByName(col.fieldPath[1])
} }
} else { } else {
err = fmt.Errorf("Unsupported mutliderive %v", col.FieldName) return nil, fmt.Errorf("Unsupported mutliderive %v", col.FieldName)
} }
if err != nil {
return nil, err if !fieldValue.IsValid() {
return nil, errors.New("no find field matched")
} }
return &fieldValue, nil return &fieldValue, nil
} }