Improve Smart AutoMigrate

go-gorm · Feb 19, 2022 · ce06e3b · ce06e3b
1 parent 3b89559
commit ce06e3b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/ddlmod.go b/ddlmod.go
@@ -96,7 +96,7 @@ func parseDDL(strs ...string) (*ddl, error) {
 						for _, name := range matches[1:] {
 							for idx, column := range result.columns {
 								if column.NameValue.String == name {
-									column.PrimayKeyValue = sql.NullBool{Bool: true, Valid: true}
+									column.PrimaryKeyValue = sql.NullBool{Bool: true, Valid: true}
 									result.columns[idx] = column
 									break
 								}
@@ -105,21 +105,28 @@ func parseDDL(strs ...string) (*ddl, error) {
 					}
 				} else if matches := columnRegexp.FindStringSubmatch(f); len(matches) > 0 {
 					columnType := migrator.ColumnType{
-						NameValue:       sql.NullString{String: matches[1], Valid: true},
-						DataTypeValue:   sql.NullString{String: matches[2], Valid: true},
-						ColumnTypeValue: sql.NullString{String: matches[2], Valid: true},
+						NameValue:         sql.NullString{String: matches[1], Valid: true},
+						DataTypeValue:     sql.NullString{String: matches[2], Valid: true},
+						ColumnTypeValue:   sql.NullString{String: matches[2], Valid: true},
+						PrimaryKeyValue:   sql.NullBool{Valid: true},
+						UniqueValue:       sql.NullBool{Valid: true},
+						NullableValue:     sql.NullBool{Valid: true},
+						DefaultValueValue: sql.NullString{Valid: true},
 					}
 
 					matchUpper := strings.ToUpper(matches[3])
 					if strings.Contains(matchUpper, " NOT NULL") {
 						columnType.NullableValue = sql.NullBool{Bool: false, Valid: true}
 					} else if strings.Contains(matchUpper, " NULL") {
 						columnType.NullableValue = sql.NullBool{Bool: true, Valid: true}
-					} else if strings.Contains(matchUpper, " UNIQUE") {
+					}
+					if strings.Contains(matchUpper, " UNIQUE") {
 						columnType.UniqueValue = sql.NullBool{Bool: true, Valid: true}
-					} else if strings.Contains(matchUpper, " PRIMARY") {
-						columnType.PrimayKeyValue = sql.NullBool{Bool: true, Valid: true}
-					} else if defaultMatches := defaultValueRegexp.FindStringSubmatch(matches[3]); len(defaultMatches) > 1 {
+					}
+					if strings.Contains(matchUpper, " PRIMARY") {
+						columnType.PrimaryKeyValue = sql.NullBool{Bool: true, Valid: true}
+					}
+					if defaultMatches := defaultValueRegexp.FindStringSubmatch(matches[3]); len(defaultMatches) > 1 {
 						columnType.DefaultValueValue = sql.NullString{String: strings.Trim(defaultMatches[1], `"`), Valid: true}
 					}
 

diff --git a/migrator.go b/migrator.go
@@ -88,7 +88,6 @@ func (m Migrator) AlterColumn(value interface{}, name string) error {
 				createSQL := reg.ReplaceAllString(rawDDL, fmt.Sprintf("`%v` ?,", field.DBName))
 
 				return createSQL, []interface{}{m.FullDataTypeOf(field)}, nil
-
 			}
 			return "", nil, fmt.Errorf("failed to alter field with name %v", name)
 		})