Merge c0eefc0ee055ae727126703888fa4018fbe5a025 into 0fd395ab37aefd2d50854f0556a4311dccc6f45a

This commit is contained in:
Artemij Shepelev 2018-06-29 13:50:20 +00:00 committed by GitHub
commit 46d8ccf79b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -46,10 +46,15 @@ type ModelStruct struct {
StructFields []*StructField StructFields []*StructField
ModelType reflect.Type ModelType reflect.Type
defaultTableName string defaultTableName string
l sync.Mutex
} }
// 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 {
s.l.Lock()
defer s.l.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 {