@@ -111,14 +111,16 @@ func (m Migrator) HasColumn(value interface{}, field string) bool {
111111func (m Migrator ) AlterColumn (value interface {}, field string ) error {
112112 return m .RunWithValue (value , func (stmt * gorm.Statement ) error {
113113 if field := stmt .Schema .LookUpField (field ); field != nil {
114- fileType := clause.Expr {SQL : m .DataTypeOf (field )}
114+ fieldType := clause.Expr {SQL : m .DataTypeOf (field )}
115115 if field .NotNull {
116- fileType .SQL += " NOT NULL"
116+ fieldType .SQL += " NOT NULL"
117+ } else {
118+ fieldType .SQL += " NULL"
117119 }
118120
119121 return m .DB .Exec (
120122 "ALTER TABLE ? ALTER COLUMN ? ?" ,
121- clause.Table {Name : stmt .Table }, clause.Column {Name : field .DBName }, fileType ,
123+ clause.Table {Name : stmt .Table }, clause.Column {Name : field .DBName }, fieldType ,
122124 ).Error
123125 }
124126 return fmt .Errorf ("failed to look up field with name: %s" , field )
@@ -171,7 +173,10 @@ func (m Migrator) ColumnTypes(value interface{}) ([]gorm.ColumnType, error) {
171173
172174 for columns .Next () {
173175 var (
174- column migrator.ColumnType
176+ column = migrator.ColumnType {
177+ PrimaryKeyValue : sql.NullBool {Valid : true },
178+ UniqueValue : sql.NullBool {Valid : true },
179+ }
175180 datetimePrecision sql.NullInt64
176181 radixValue sql.NullInt64
177182 nullableValue sql.NullString
@@ -198,6 +203,8 @@ func (m Migrator) ColumnTypes(value interface{}) ([]gorm.ColumnType, error) {
198203 column .DefaultValueValue .String = matches [1 ]
199204 matches = defaultValueTrimRegexp .FindStringSubmatch (column .DefaultValueValue .String )
200205 }
206+ } else {
207+ column .DefaultValueValue .Valid = true
201208 }
202209
203210 for _ , c := range rawColumnTypes {
@@ -224,7 +231,7 @@ func (m Migrator) ColumnTypes(value interface{}) ([]gorm.ColumnType, error) {
224231 if mc .NameValue .String == name {
225232 switch columnType {
226233 case "PRIMARY KEY" :
227- mc .PrimayKeyValue = sql.NullBool {Bool : true , Valid : true }
234+ mc .PrimaryKeyValue = sql.NullBool {Bool : true , Valid : true }
228235 case "UNIQUE" :
229236 mc .UniqueValue = sql.NullBool {Bool : true , Valid : true }
230237 }
0 commit comments