HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor tableName

This commit is contained in:
Lunny Xiao 2018-04-09 17:37:28 +08:00
parent 26ee002658
commit f90ef0062d
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine.go
View File

@ -819,7 +819,7 @@ func (engine *Engine) TableInfo(bean interface{}) *Table {
if err != nil { if err != nil {
engine.logger.Error(err) engine.logger.Error(err)
} }
return &Table{tb, engine.tbName(v)} return &Table{tb, engine.tableName(bean)}
} }
func addIndex(indexName string, table *core.Table, col *core.Column, indexType int) { func addIndex(indexName string, table *core.Table, col *core.Column, indexType int) {
@ -1134,7 +1134,7 @@ func (engine *Engine) ClearCacheBean(bean interface{}, id string) error {
if t.Kind() != reflect.Struct { if t.Kind() != reflect.Struct {
return errors.New("error params") return errors.New("error params")
} }
tableName := engine.tbName(v) tableName := engine.tableName(bean)
table, err := engine.autoMapType(v) table, err := engine.autoMapType(v)
if err != nil { if err != nil {
return err return err
@ -1158,7 +1158,7 @@ func (engine *Engine) ClearCache(beans ...interface{}) error {
if t.Kind() != reflect.Struct { if t.Kind() != reflect.Struct {
return errors.New("error params") return errors.New("error params")
} }
tableName := engine.tbName(v) tableName := engine.tableName(bean)
table, err := engine.autoMapType(v) table, err := engine.autoMapType(v)
if err != nil { if err != nil {
return err return err

4
engine_table.go
View File

@ -27,8 +27,8 @@ func (engine *Engine) TableNameWithSchema(v string) string {
return v return v
} }
func (engine *Engine) tbName(v reflect.Value) string { func (engine *Engine) tableName(bean interface{}) string {
return engine.TableNameWithSchema(engine.tbNameNoSchemaString(v.Interface())) return engine.TableNameWithSchema(engine.tbNameNoSchemaString(bean))
} }
func (engine *Engine) tbNameForMap(v reflect.Value) string { func (engine *Engine) tbNameForMap(v reflect.Value) string {

2
statement.go
View File

@ -221,7 +221,7 @@ func (statement *Statement) setRefValue(v reflect.Value) error {
if err != nil { if err != nil {
return err return err
} }
statement.tableName = statement.Engine.tbName(v) statement.tableName = statement.Engine.tableName(v.Interface())
return nil return nil
} }