xorm/xorm
xorm/xorm
64
359
Fork 208
Code Issues 373 Pull Requests 18 Actions Releases 35 Activity

refactor for value2String #713

Merged
lunny merged 1 commits from lunny/rename_value2String into master 2017-09-09 11:21:05 +00:00
Conversation 1 Commits 1 Files Changed 2 +5 -15
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
session_query.go
View File

@ -22,7 +22,7 @@ func (session *Session) Query(sqlStr string, args ...interface{}) ([]map[string]
return session.queryBytes(sqlStr, args...)
}
func reflect2value(rawValue *reflect.Value) (str string, err error) {
func value2String(rawValue *reflect.Value) (str string, err error) {
aa := reflect.TypeOf((*rawValue).Interface())
vv := reflect.ValueOf((*rawValue).Interface())
switch aa.Kind() {
@ -69,14 +69,6 @@ func reflect2value(rawValue *reflect.Value) (str string, err error) {
return
}
func value2String(rawValue *reflect.Value) (data string, err error) {
data, err = reflect2value(rawValue)
if err != nil {
return
}
return
}
func row2mapStr(rows *core.Rows, fields []string) (resultsMap map[string]string, err error) {
result := make(map[string]string)
scanResultContainers := make([]interface{}, len(fields))

10
session_raw.go
View File

@ -79,14 +79,12 @@ func (session *Session) queryRow(sqlStr string, args ...interface{}) *core.Row {
return core.NewRow(session.queryRows(sqlStr, args...))
}
func value2Bytes(rawValue *reflect.Value) (data []byte, err error) {
var str string
str, err = reflect2value(rawValue)
func value2Bytes(rawValue *reflect.Value) ([]byte, error) {
str, err := value2String(rawValue)
if err != nil {
return
return nil, err
}
data = []byte(str)
return
return []byte(str), nil
}
func row2map(rows *core.Rows, fields []string) (resultsMap map[string][]byte, err error) {