From a5ae25f65e20fc1d9e8f9ec0f1427854216ac821 Mon Sep 17 00:00:00 2001 From: nfjbill Date: Fri, 18 Feb 2022 14:48:42 +0800 Subject: [PATCH] update --- dm_test.go | 8 ++++---- namer.go | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dm_test.go b/dm_test.go index ad00467..67144a6 100644 --- a/dm_test.go +++ b/dm_test.go @@ -35,7 +35,7 @@ type User struct { Birthday time.Time } -type Per struct { +type PerPel struct { gorm.Model Key string `gorm:"index:key,unique"` Name string `gorm:"index:name"` @@ -59,9 +59,9 @@ func TestAutoMigrate(t *testing.T) { err = Table().AutoMigrate(&User{}) err = Table().AutoMigrate(&User{}) err = Table().AutoMigrate(&User{}) - err = Table().AutoMigrate(&Per{}) - err = Table().AutoMigrate(&Per{}) - err = Table().AutoMigrate(&Per{}) + err = Table().AutoMigrate(&PerPel{}) + err = Table().AutoMigrate(&PerPel{}) + err = Table().AutoMigrate(&PerPel{}) if err != nil { fmt.Printf("Error: failed to AutoMigrate: %v\n", err) diff --git a/namer.go b/namer.go index 953a054..c6c8f5f 100644 --- a/namer.go +++ b/namer.go @@ -34,10 +34,10 @@ func (n Namer) CheckerName(table, column string) (name string) { } func (n Namer) IndexName(table, column string) (name string) { - cl := n.NamingStrategy.IndexName(table, column) - ac := strings.Split(strings.ToLower(column), "idx") + tlc := strings.ToLower(column) - if len(ac) > 1 { + cl := n.NamingStrategy.IndexName(table, column) + if strings.Contains(tlc, "idx_"+strings.ToLower(table)) && strings.Contains(tlc, strings.ToLower(column)) { cl = column }