tablet/gorm
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Race condition in tablename

Browse Source 
Fixes https://github.com/jinzhu/gorm/issues/1407
This commit is contained in:
Jonathan Friedman 2018-06-19 11:42:09 -04:00 committed by GitHub
parent 82eb9f8a5b
commit 1acdf8b3ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
model_struct.go
View File

@ -17,6 +17,8 @@ var DefaultTableNameHandler = func(db *DB, defaultTableName string) string {
return defaultTableName return defaultTableName
} }
var mutex sync.Mutex
type safeModelStructsMap struct { type safeModelStructsMap struct {
m map[reflect.Type]*ModelStruct m map[reflect.Type]*ModelStruct
l *sync.RWMutex l *sync.RWMutex
@ -50,6 +52,9 @@ type ModelStruct struct {
// TableName get model's table name // TableName get model's table name
func (s *ModelStruct) TableName(db *DB) string { func (s *ModelStruct) TableName(db *DB) string {
mutex.Lock()
defer mutex.Unlock()
if s.defaultTableName == "" && db != nil && s.ModelType != nil { if s.defaultTableName == "" && db != nil && s.ModelType != nil {
// Set default table name // Set default table name
if tabler, ok := reflect.New(s.ModelType).Interface().(tabler); ok { if tabler, ok := reflect.New(s.ModelType).Interface().(tabler); ok {