From f90ef0062d91e77774019eba9992e57fa41331b9 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 9 Apr 2018 17:37:28 +0800 Subject: [PATCH] refactor tableName --- engine.go | 6 +++--- engine_table.go | 4 ++-- statement.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/engine.go b/engine.go index eff608df..2c8434c7 100644 --- a/engine.go +++ b/engine.go @@ -819,7 +819,7 @@ func (engine *Engine) TableInfo(bean interface{}) *Table { if err != nil { 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) { @@ -1134,7 +1134,7 @@ func (engine *Engine) ClearCacheBean(bean interface{}, id string) error { if t.Kind() != reflect.Struct { return errors.New("error params") } - tableName := engine.tbName(v) + tableName := engine.tableName(bean) table, err := engine.autoMapType(v) if err != nil { return err @@ -1158,7 +1158,7 @@ func (engine *Engine) ClearCache(beans ...interface{}) error { if t.Kind() != reflect.Struct { return errors.New("error params") } - tableName := engine.tbName(v) + tableName := engine.tableName(bean) table, err := engine.autoMapType(v) if err != nil { return err diff --git a/engine_table.go b/engine_table.go index fbc1fddd..78218cb3 100644 --- a/engine_table.go +++ b/engine_table.go @@ -27,8 +27,8 @@ func (engine *Engine) TableNameWithSchema(v string) string { return v } -func (engine *Engine) tbName(v reflect.Value) string { - return engine.TableNameWithSchema(engine.tbNameNoSchemaString(v.Interface())) +func (engine *Engine) tableName(bean interface{}) string { + return engine.TableNameWithSchema(engine.tbNameNoSchemaString(bean)) } func (engine *Engine) tbNameForMap(v reflect.Value) string { diff --git a/statement.go b/statement.go index 5a2802d9..e8acb1e3 100644 --- a/statement.go +++ b/statement.go @@ -221,7 +221,7 @@ func (statement *Statement) setRefValue(v reflect.Value) error { if err != nil { return err } - statement.tableName = statement.Engine.tbName(v) + statement.tableName = statement.Engine.tableName(v.Interface()) return nil }