Merge 87b284751d into a5702e52b5

2019-09-30 07:08:18 +00:00 · 2019-09-30 07:08:18 +00:00 · 445256b203
parent a5702e52b5 87b284751d
commit 445256b203
1 changed files with 15 additions and 1 deletions
--- a/session_find.go
+++ b/session_find.go
@ -396,7 +396,21 @@ func (session *Session) cacheFind(t reflect.Type, sqlStr string, rowsSlicePtr in
 			return err
 		}
 		bean := cacher.GetBean(tableName, sid)
-		if bean == nil || reflect.ValueOf(bean).Elem().Type() != t {
+
+		// fix issue #894
+		isHit := func() (ht bool) {
+			if bean == nil {
+				ht = false
+				return
+			}
+			ckb := reflect.ValueOf(bean).Elem().Type()
+			ht = ckb == t
+			if !ht && t.Kind() == reflect.Ptr {
+				ht = t.Elem() == ckb
+			}
+			return
+		}
+		if !isHit() {
 			ides = append(ides, id)
 			ididxes[sid] = idx
 		} else {