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

[migrator] Use full data type when add column

Browse Source
This commit is contained in:
Jinzhu 2020-03-30 09:31:02 +08:00
parent 3a126233bf
commit be537f29ec
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
migrator/migrator.go
View File

@ -45,6 +45,27 @@ func (m Migrator) DataTypeOf(field *schema.Field) string {
return m.Dialector.DataTypeOf(field) return m.Dialector.DataTypeOf(field)
} }
func (m Migrator) FullDataTypeOf(field *schema.Field) string {
dataType := m.DataTypeOf(field)
if field.AutoIncrement {
dataType += " AUTO_INCREMENT"
}
if field.NotNull {
dataType += " NOT NULL"
}
if field.Unique {
dataType += " UNIQUE"
}
if field.HasDefaultValue {
dataType += " DEFAULT " + field.DefaultValue
}
return dataType
}
// AutoMigrate // AutoMigrate
func (m Migrator) AutoMigrate(values ...interface{}) error { func (m Migrator) AutoMigrate(values ...interface{}) error {
// TODO smart migrate data type // TODO smart migrate data type
@ -113,24 +134,7 @@ func (m Migrator) CreateTable(values ...interface{}) error {
field := stmt.Schema.FieldsByDBName[dbName] field := stmt.Schema.FieldsByDBName[dbName]
createTableSQL += fmt.Sprintf("? ?") createTableSQL += fmt.Sprintf("? ?")
hasPrimaryKeyInDataType = hasPrimaryKeyInDataType || strings.Contains(strings.ToUpper(field.DBDataType), "PRIMARY KEY") hasPrimaryKeyInDataType = hasPrimaryKeyInDataType || strings.Contains(strings.ToUpper(field.DBDataType), "PRIMARY KEY")
values = append(values, clause.Column{Name: dbName}, clause.Expr{SQL: m.DataTypeOf(field)}) values = append(values, clause.Column{Name: dbName}, clause.Expr{SQL: m.FullDataTypeOf(field)})
if field.AutoIncrement {
createTableSQL += " AUTO_INCREMENT"
}
if field.NotNull {
createTableSQL += " NOT NULL"
}
if field.Unique {
createTableSQL += " UNIQUE"
}
if field.DefaultValue != "" {
createTableSQL += " DEFAULT ?"
values = append(values, clause.Expr{SQL: field.DefaultValue})
}
createTableSQL += "," createTableSQL += ","
} }
@ -220,7 +224,7 @@ func (m Migrator) AddColumn(value interface{}, field string) error {
if field := stmt.Schema.LookUpField(field); field != nil { if field := stmt.Schema.LookUpField(field); field != nil {
return m.DB.Exec( return m.DB.Exec(
"ALTER TABLE ? ADD ? ?", "ALTER TABLE ? ADD ? ?",
clause.Table{Name: stmt.Table}, clause.Column{Name: field.DBName}, clause.Expr{SQL: m.DataTypeOf(field)}, clause.Table{Name: stmt.Table}, clause.Column{Name: field.DBName}, clause.Expr{SQL: m.FullDataTypeOf(field)},
).Error ).Error
} }
return fmt.Errorf("failed to look up field with name: %s", field) return fmt.Errorf("failed to look up field with name: %s", field)