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

fix: automigrate error caused by indexes while using dynamic table name #4752

Browse Source
This commit is contained in:
Wendell Sun 2021-10-11 13:44:18 +08:00
parent 418c60c83c
commit 66388cf40b
2 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
migrator/migrator.go
View File

@ -687,10 +687,10 @@ func (m Migrator) ReorderModels(values []interface{}, autoAdd bool) (results []i
parsedSchemas = map[*schema.Schema]bool{} parsedSchemas = map[*schema.Schema]bool{}
valuesMap = map[string]Dependency{} valuesMap = map[string]Dependency{}
insertIntoOrderedList func(name string) insertIntoOrderedList func(name string)
parseDependence func(value interface{}, addToList bool) parseDependence func(value interface{}, addToList, useSchemaTable bool)
) )
parseDependence = func(value interface{}, addToList bool) { parseDependence = func(value interface{}, addToList, useSchemaTable bool) {
dep := Dependency{ dep := Dependency{
Statement: &gorm.Statement{DB: m.DB, Dest: value}, Statement: &gorm.Statement{DB: m.DB, Dest: value},
} }
@ -698,6 +698,13 @@ func (m Migrator) ReorderModels(values []interface{}, autoAdd bool) (results []i
if err := dep.Parse(value); err != nil { if err := dep.Parse(value); err != nil {
m.DB.Logger.Error(context.Background(), "failed to parse value %#v, got error %v", value, err) m.DB.Logger.Error(context.Background(), "failed to parse value %#v, got error %v", value, err)
} }
if useSchemaTable {
if m.DB.Statement != nil && m.DB.Statement.Table != "" {
dep.Schema.Table = m.DB.Statement.Table
}
}
if _, ok := parsedSchemas[dep.Statement.Schema]; ok { if _, ok := parsedSchemas[dep.Statement.Schema]; ok {
return return
} }
@ -719,9 +726,9 @@ func (m Migrator) ReorderModels(values []interface{}, autoAdd bool) (results []i
dep.Depends = append(dep.Depends, rel.FieldSchema) dep.Depends = append(dep.Depends, rel.FieldSchema)
} else { } else {
fieldValue := reflect.New(rel.FieldSchema.ModelType).Interface() fieldValue := reflect.New(rel.FieldSchema.ModelType).Interface()
parseDependence(fieldValue, autoAdd) parseDependence(fieldValue, autoAdd, false)
} }
parseDependence(joinValue, autoAdd) parseDependence(joinValue, autoAdd, false)
}(rel, reflect.New(rel.JoinTable.ModelType).Interface()) }(rel, reflect.New(rel.JoinTable.ModelType).Interface())
} }
} }
@ -745,7 +752,7 @@ func (m Migrator) ReorderModels(values []interface{}, autoAdd bool) (results []i
if _, ok := valuesMap[d.Table]; ok { if _, ok := valuesMap[d.Table]; ok {
insertIntoOrderedList(d.Table) insertIntoOrderedList(d.Table)
} else { } else {
parseDependence(reflect.New(d.ModelType).Interface(), autoAdd) parseDependence(reflect.New(d.ModelType).Interface(), autoAdd, false)
insertIntoOrderedList(d.Table) insertIntoOrderedList(d.Table)
} }
} }
@ -758,7 +765,7 @@ func (m Migrator) ReorderModels(values []interface{}, autoAdd bool) (results []i
if v, ok := value.(string); ok { if v, ok := value.(string); ok {
results = append(results, v) results = append(results, v)
} else { } else {
parseDependence(value, true) parseDependence(value, true, true)
} }
} }

37
tests/migrate_test.go
View File

@ -381,3 +381,40 @@ func TestMigrateConstraint(t *testing.T) {
} }
} }
} }
type NewUser struct {
gorm.Model
Name string `gorm:"index"`
Table string `gorm:"-"`
}
func TestMigrateIndexesWithDynamicTableName(t *testing.T) {
tableNameFunc := func(v string) string {
return "newuser_" + strings.ToLower(v)
}
userTableFunc := func(u *NewUser) func(*gorm.DB) *gorm.DB {
return func(db *gorm.DB) *gorm.DB {
return db.Table(tableNameFunc(u.Table))
}
}
tableName := []string{"a", "b", "c"}
for _, v := range tableName {
nu := &NewUser{
Table: v,
}
tableName := tableNameFunc(nu.Table)
m := DB.Scopes(userTableFunc(nu)).Migrator()
if err := m.AutoMigrate(&nu); err != nil {
t.Fatalf("Failed to create table for %#v---", tableName)
}
if !m.HasTable(tableName) {
t.Fatalf("Failed to create table for %#v---", tableName)
}
if !m.HasIndex(&NewUser{}, "Name") {
t.Fatalf("Should find index for %s's name after AutoMigrate", tableName)
}
}
}