From 42802eae92ed004887c0f4e8f9b5e03b2d92ce98 Mon Sep 17 00:00:00 2001
From: MamoruMurakami <mamoru@prty.jp>
Date: Wed, 5 Jul 2017 23:51:02 +0900
Subject: [PATCH] fix bugs cache key when pk is defined as uint (#330)

---
 engine.go       | 25 ++++++++++++++++++++++---
 session_find.go | 15 +++------------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/engine.go b/engine.go
index 6e5f14fe..fc19371e 100644
--- a/engine.go
+++ b/engine.go
@@ -1104,19 +1104,38 @@ func (engine *Engine) idOfV(rv reflect.Value) (core.PK, error) {
 
 	pk := make([]interface{}, len(table.PrimaryKeys))
 	for i, col := range table.PKColumns() {
+		var err error
 		pkField := v.FieldByName(col.FieldName)
 		switch pkField.Kind() {
 		case reflect.String:
-			pk[i] = pkField.String()
+			pk[i], err = engine.idTypeAssertion(col, pkField.String())
 		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-			pk[i] = pkField.Int()
+			pk[i], err = engine.idTypeAssertion(col, strconv.FormatInt(pkField.Int(), 10))
 		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-			pk[i] = pkField.Uint()
+			pk[i], err = engine.idTypeAssertion(col, strconv.FormatUint(pkField.Uint(), 10))
+		}
+
+		if err != nil {
+			return nil, err
 		}
 	}
 	return core.PK(pk), nil
 }
 
+func (engine *Engine) idTypeAssertion(col *core.Column, sid string) (interface{}, error) {
+	if col.SQLType.IsNumeric() {
+		n, err := strconv.ParseInt(sid, 10, 64)
+		if err != nil {
+			return nil, err
+		}
+		return n, nil
+	} else if col.SQLType.IsText() {
+		return sid, nil
+	} else {
+		return nil, errors.New("not supported")
+	}
+}
+
 // CreateIndexes create indexes
 func (engine *Engine) CreateIndexes(bean interface{}) error {
 	session := engine.NewSession()
diff --git a/session_find.go b/session_find.go
index be64878a..b711991e 100644
--- a/session_find.go
+++ b/session_find.go
@@ -8,7 +8,6 @@ import (
 	"errors"
 	"fmt"
 	"reflect"
-	"strconv"
 	"strings"
 
 	"github.com/go-xorm/builder"
@@ -323,19 +322,11 @@ func (session *Session) cacheFind(t reflect.Type, sqlStr string, rowsSlicePtr in
 			if err != nil {
 				return err
 			}
-
 			var pk core.PK = make([]interface{}, len(table.PrimaryKeys))
 			for i, col := range table.PKColumns() {
-				if col.SQLType.IsNumeric() {
-					n, err := strconv.ParseInt(res[i], 10, 64)
-					if err != nil {
-						return err
-					}
-					pk[i] = n
-				} else if col.SQLType.IsText() {
-					pk[i] = res[i]
-				} else {
-					return errors.New("not supported")
+				pk[i], err = session.Engine.idTypeAssertion(col, res[i])
+				if err != nil {
+					return err
 				}
 			}