fix bugs cache key when pk is defined as uint (#330)
This commit is contained in:
parent
c6d1444d66
commit
42802eae92
25
engine.go
25
engine.go
|
@ -1104,19 +1104,38 @@ func (engine *Engine) idOfV(rv reflect.Value) (core.PK, error) {
|
||||||
|
|
||||||
pk := make([]interface{}, len(table.PrimaryKeys))
|
pk := make([]interface{}, len(table.PrimaryKeys))
|
||||||
for i, col := range table.PKColumns() {
|
for i, col := range table.PKColumns() {
|
||||||
|
var err error
|
||||||
pkField := v.FieldByName(col.FieldName)
|
pkField := v.FieldByName(col.FieldName)
|
||||||
switch pkField.Kind() {
|
switch pkField.Kind() {
|
||||||
case reflect.String:
|
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:
|
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:
|
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
|
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
|
// CreateIndexes create indexes
|
||||||
func (engine *Engine) CreateIndexes(bean interface{}) error {
|
func (engine *Engine) CreateIndexes(bean interface{}) error {
|
||||||
session := engine.NewSession()
|
session := engine.NewSession()
|
||||||
|
|
|
@ -8,7 +8,6 @@ import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"reflect"
|
"reflect"
|
||||||
"strconv"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/go-xorm/builder"
|
"github.com/go-xorm/builder"
|
||||||
|
@ -323,19 +322,11 @@ func (session *Session) cacheFind(t reflect.Type, sqlStr string, rowsSlicePtr in
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
var pk core.PK = make([]interface{}, len(table.PrimaryKeys))
|
var pk core.PK = make([]interface{}, len(table.PrimaryKeys))
|
||||||
for i, col := range table.PKColumns() {
|
for i, col := range table.PKColumns() {
|
||||||
if col.SQLType.IsNumeric() {
|
pk[i], err = session.Engine.idTypeAssertion(col, res[i])
|
||||||
n, err := strconv.ParseInt(res[i], 10, 64)
|
if err != nil {
|
||||||
if err != nil {
|
return err
|
||||||
return err
|
|
||||||
}
|
|
||||||
pk[i] = n
|
|
||||||
} else if col.SQLType.IsText() {
|
|
||||||
pk[i] = res[i]
|
|
||||||
} else {
|
|
||||||
return errors.New("not supported")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue