Skip to content

Commit

Permalink
[#6372] Fixed nullable constraint bug for columns during auto migrati…
Browse files Browse the repository at this point in the history
…on (#7269)

* [#6372] Fixed nullable constraint bug for columns during auto migration

* [#6372] fix comment

* [#6372] Add test code

* [#6372] Add test code

* [#6372] Fix failed test case

* [#6372] Fix failed test case

* [#6372] wip

* [#6372] wip

* [#6372] wip

* [#6372] wip
  • Loading branch information
wookie0 authored Nov 14, 2024
1 parent deceebf commit b0d70a2
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 3 deletions.
4 changes: 2 additions & 2 deletions migrator/migrator.go
Original file line number Diff line number Diff line change
Expand Up @@ -524,8 +524,8 @@ func (m Migrator) MigrateColumn(value interface{}, field *schema.Field, columnTy

// check nullable
if nullable, ok := columnType.Nullable(); ok && nullable == field.NotNull {
// not primary key & database is nullable
if !field.PrimaryKey && nullable {
// not primary key & current database is non-nullable(to be nullable)
if !field.PrimaryKey && !nullable {
alterColumn = true
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
gorm.io/driver/mysql v1.5.7
gorm.io/driver/postgres v1.5.9
gorm.io/driver/sqlite v1.5.6
gorm.io/driver/sqlserver v1.5.3
gorm.io/driver/sqlserver v1.5.4
gorm.io/gorm v1.25.12
)

Expand Down
42 changes: 42 additions & 0 deletions tests/migrate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,48 @@ func TestAutoMigrateSelfReferential(t *testing.T) {
}
}

func TestAutoMigrateNullable(t *testing.T) {
type MigrateNullableColumn struct {
ID uint
Bonus float64 `gorm:"not null"`
Stock float64
}

DB.Migrator().DropTable(&MigrateNullableColumn{})

DB.AutoMigrate(&MigrateNullableColumn{})

type MigrateNullableColumn2 struct {
ID uint
Bonus float64
Stock float64 `gorm:"not null"`
}

if err := DB.Table("migrate_nullable_columns").AutoMigrate(&MigrateNullableColumn2{}); err != nil {
t.Fatalf("failed to auto migrate, got error: %v", err)
}

columnTypes, err := DB.Table("migrate_nullable_columns").Migrator().ColumnTypes(&MigrateNullableColumn{})
if err != nil {
t.Fatalf("failed to get column types, got error: %v", err)
}

for _, columnType := range columnTypes {
switch columnType.Name() {
case "bonus":
// allow to change non-nullable to nullable
if nullable, _ := columnType.Nullable(); !nullable {
t.Fatalf("bonus's nullable should be true, bug got %t", nullable)
}
case "stock":
// do not allow to change nullable to non-nullable
if nullable, _ := columnType.Nullable(); !nullable {
t.Fatalf("stock's nullable should be true, bug got %t", nullable)
}
}
}
}

func TestSmartMigrateColumn(t *testing.T) {
fullSupported := map[string]bool{"mysql": true, "postgres": true}[DB.Dialector.Name()]

Expand Down

0 comments on commit b0d70a2

Please sign in to comment.