Merge 51abb15f12885218161e2bd7ffb9c2b23c63ec0e into 373bcf7aca01ef76c8ba5c3bc1ff191b020afc7b
This commit is contained in:
commit
580de0696c
@ -440,7 +440,7 @@ func (m Migrator) MigrateColumn(value interface{}, field *schema.Field, columnTy
|
||||
}
|
||||
|
||||
// check unique
|
||||
if unique, ok := columnType.Unique(); ok && unique != field.Unique {
|
||||
if unique, ok := columnType.Unique(); ok && !(unique == field.Unique || field.UniqueIndex == unique) {
|
||||
// not primary key
|
||||
if !field.PrimaryKey {
|
||||
alterColumn = true
|
||||
|
@ -68,6 +68,7 @@ type Field struct {
|
||||
DefaultValue string
|
||||
DefaultValueInterface interface{}
|
||||
NotNull bool
|
||||
UniqueIndex bool
|
||||
Unique bool
|
||||
Comment string
|
||||
Size int
|
||||
@ -114,6 +115,7 @@ func (schema *Schema) ParseField(fieldStruct reflect.StructField) *Field {
|
||||
HasDefaultValue: utils.CheckTruth(tagSetting["AUTOINCREMENT"]),
|
||||
NotNull: utils.CheckTruth(tagSetting["NOT NULL"], tagSetting["NOTNULL"]),
|
||||
Unique: utils.CheckTruth(tagSetting["UNIQUE"]),
|
||||
UniqueIndex: utils.CheckTruth(tagSetting["UNIQUEINDEX"]),
|
||||
Comment: tagSetting["COMMENT"],
|
||||
AutoIncrementIncrement: 1,
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user