From 694d32e3e3db3f2cfa6c3601d9ac200a46ad7ffc Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sun, 4 Jul 2021 17:41:38 +0800
Subject: [PATCH] refactor

---
 scan.go          | 26 +++++++++++++++++++++++---
 session_query.go |  4 ++--
 session_raw.go   | 22 +---------------------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/scan.go b/scan.go
index 7104a2f1..e11d6e8d 100644
--- a/scan.go
+++ b/scan.go
@@ -12,7 +12,7 @@ import (
 	"xorm.io/xorm/dialects"
 )
 
-func (engine *Engine) row2mapStr(rows *core.Rows, types []*sql.ColumnType, fields []string) (map[string]string, error) {
+func row2mapStr(rows *core.Rows, types []*sql.ColumnType, fields []string) (map[string]string, error) {
 	var scanResults = make([]interface{}, len(fields))
 	for i := 0; i < len(fields); i++ {
 		var s sql.NullString
@@ -31,7 +31,7 @@ func (engine *Engine) row2mapStr(rows *core.Rows, types []*sql.ColumnType, field
 	return result, nil
 }
 
-func (engine *Engine) row2mapBytes(rows *core.Rows, types []*sql.ColumnType, fields []string) (map[string][]byte, error) {
+func row2mapBytes(rows *core.Rows, types []*sql.ColumnType, fields []string) (map[string][]byte, error) {
 	var scanResults = make([]interface{}, len(fields))
 	for i := 0; i < len(fields); i++ {
 		var s sql.NullString
@@ -50,7 +50,7 @@ func (engine *Engine) row2mapBytes(rows *core.Rows, types []*sql.ColumnType, fie
 	return result, nil
 }
 
-func (engine *Engine) row2sliceStr(rows *core.Rows, types []*sql.ColumnType, fields []string) ([]string, error) {
+func row2sliceStr(rows *core.Rows, types []*sql.ColumnType, fields []string) ([]string, error) {
 	results := make([]string, 0, len(fields))
 	var scanResults = make([]interface{}, len(fields))
 	for i := 0; i < len(fields); i++ {
@@ -68,6 +68,26 @@ func (engine *Engine) row2sliceStr(rows *core.Rows, types []*sql.ColumnType, fie
 	return results, nil
 }
 
+func rows2maps(rows *core.Rows) (resultsSlice []map[string][]byte, err error) {
+	fields, err := rows.Columns()
+	if err != nil {
+		return nil, err
+	}
+	types, err := rows.ColumnTypes()
+	if err != nil {
+		return nil, err
+	}
+	for rows.Next() {
+		result, err := row2mapBytes(rows, types, fields)
+		if err != nil {
+			return nil, err
+		}
+		resultsSlice = append(resultsSlice, result)
+	}
+
+	return resultsSlice, nil
+}
+
 func (engine *Engine) row2mapInterface(rows *core.Rows, types []*sql.ColumnType, fields []string) (map[string]interface{}, error) {
 	var resultsMap = make(map[string]interface{}, len(fields))
 	var scanResultContainers = make([]interface{}, len(fields))
diff --git a/session_query.go b/session_query.go
index d14c3908..01cd6f44 100644
--- a/session_query.go
+++ b/session_query.go
@@ -33,7 +33,7 @@ func (session *Session) rows2Strings(rows *core.Rows) (resultsSlice []map[string
 	}
 
 	for rows.Next() {
-		result, err := session.engine.row2mapStr(rows, types, fields)
+		result, err := row2mapStr(rows, types, fields)
 		if err != nil {
 			return nil, err
 		}
@@ -54,7 +54,7 @@ func (session *Session) rows2SliceString(rows *core.Rows) (resultsSlice [][]stri
 	}
 
 	for rows.Next() {
-		record, err := session.engine.row2sliceStr(rows, types, fields)
+		record, err := row2sliceStr(rows, types, fields)
 		if err != nil {
 			return nil, err
 		}
diff --git a/session_raw.go b/session_raw.go
index c42f9de1..bf32c6ed 100644
--- a/session_raw.go
+++ b/session_raw.go
@@ -130,26 +130,6 @@ func value2Bytes(rawValue *reflect.Value) ([]byte, error) {
 	return []byte(str), nil
 }
 
-func (session *Session) rows2maps(rows *core.Rows) (resultsSlice []map[string][]byte, err error) {
-	fields, err := rows.Columns()
-	if err != nil {
-		return nil, err
-	}
-	types, err := rows.ColumnTypes()
-	if err != nil {
-		return nil, err
-	}
-	for rows.Next() {
-		result, err := session.engine.row2mapBytes(rows, types, fields)
-		if err != nil {
-			return nil, err
-		}
-		resultsSlice = append(resultsSlice, result)
-	}
-
-	return resultsSlice, nil
-}
-
 func (session *Session) queryBytes(sqlStr string, args ...interface{}) ([]map[string][]byte, error) {
 	rows, err := session.queryRows(sqlStr, args...)
 	if err != nil {
@@ -157,7 +137,7 @@ func (session *Session) queryBytes(sqlStr string, args ...interface{}) ([]map[st
 	}
 	defer rows.Close()
 
-	return session.rows2maps(rows)
+	return rows2maps(rows)
 }
 
 func (session *Session) exec(sqlStr string, args ...interface{}) (sql.Result, error) {