From 859ebcfaa68eee805c9db84c0d05d7d2663ce7b7 Mon Sep 17 00:00:00 2001 From: hot1232 Date: Tue, 20 Nov 2018 18:05:26 +0800 Subject: [PATCH] Update model_struct.go MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 处理在同时定义gorm.DefaultTableNameHandler和Model.TableName时,db.Find()与db.Where()函数获取表名结果不一致的问题 --- model_struct.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/model_struct.go b/model_struct.go index 8c27e209..2585988a 100644 --- a/model_struct.go +++ b/model_struct.go @@ -13,9 +13,7 @@ import ( ) // DefaultTableNameHandler default table name handler -var DefaultTableNameHandler = func(db *DB, defaultTableName string) string { - return defaultTableName -} +var DefaultTableNameHandler = func(db *DB, defaultTableName string) string var modelStructsMap sync.Map @@ -46,7 +44,9 @@ func (s *ModelStruct) TableName(db *DB) string { s.defaultTableName = tableName } } - + if nil == DefaultTableNameHandler { + return s.defaultTableName + } return DefaultTableNameHandler(db, s.defaultTableName) }