Merge 1acdf8b3ea53603a07a47609a4dad9b2ec30e117 into 409121d9e394922787885b001d148a05e3a42b6c

model_struct.go

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