From aab77ab84c42f635f3d2213edcdf51e2a3b29eb2 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sat, 9 Sep 2017 19:21:05 +0800
Subject: [PATCH] refactor for value2String (#713)

---
 session_query.go | 10 +---------
 session_raw.go   | 10 ++++------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/session_query.go b/session_query.go
index 8bd11a3e..a693bace 100644
--- a/session_query.go
+++ b/session_query.go
@@ -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))
diff --git a/session_raw.go b/session_raw.go
index 46d0eba0..c225598e 100644
--- a/session_raw.go
+++ b/session_raw.go
@@ -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) {