diff --git a/callbacks/create.go b/callbacks/create.go index e5929adb..b1f54932 100644 --- a/callbacks/create.go +++ b/callbacks/create.go @@ -3,7 +3,6 @@ package callbacks import ( "fmt" "reflect" - "strings" "gorm.io/gorm" "gorm.io/gorm/clause" @@ -373,8 +372,9 @@ func ConvertToCreateValues(stmt *gorm.Statement) (values clause.Values) { for _, column := range values.Columns { if field := stmt.Schema.LookUpField(column.Name); field != nil { if v, ok := selectColumns[field.DBName]; (ok && v) || (!ok && !restricted) { - if !field.PrimaryKey && (!field.HasDefaultValue || field.DefaultValueInterface != nil || - strings.EqualFold(field.DefaultValue, "NULL")) && field.AutoCreateTime == 0 { + // We can confirm the column either has a value or default value, + // so checking HasDefaultValue again will cause some columns to be missed. + if !field.PrimaryKey && field.AutoCreateTime == 0 { if field.AutoUpdateTime > 0 { assignment := clause.Assignment{Column: clause.Column{Name: field.DBName}, Value: curTime} switch field.AutoUpdateTime { diff --git a/tests/associations_test.go b/tests/associations_test.go index 4e8862e5..c4e35020 100644 --- a/tests/associations_test.go +++ b/tests/associations_test.go @@ -3,6 +3,7 @@ package tests_test import ( "testing" + "gorm.io/datatypes" "gorm.io/gorm" "gorm.io/gorm/clause" "gorm.io/gorm/schema" @@ -183,6 +184,56 @@ func TestForeignKeyConstraintsBelongsTo(t *testing.T) { } } +func TestFullSaveAssociationsWithJSONDefault(t *testing.T) { + if DB.Dialector.Name() == "mysql" { + t.Skip() // mysql json can't have a default value + } + + type ValueDep struct { + ID int + ValueID int + Name string + Params datatypes.JSONMap `gorm:"default:'{}'"` + } + type Value struct { + ID int + Name string + Dep ValueDep + } + + if err := DB.Migrator().DropTable(&ValueDep{}, &Value{}); err != nil { + t.Fatalf("failed to drop value table, got err: %v", err) + } + if err := DB.AutoMigrate(&ValueDep{}, &Value{}); err != nil { + t.Fatalf("failed to migrate value table, got err: %v", err) + } + + if err := DB.Create(&Value{ + Name: "foo", + Dep: ValueDep{Name: "bar", Params: map[string]interface{}{"foo": "bar"}}, + }).Error; err != nil { + t.Errorf("failed to create value, got err: %v", err) + } + + var value Value + if err := DB.Preload("Dep").First(&value).Error; err != nil { + t.Errorf("failed to find value, got err: %v", err) + } + + value.Dep.Params["foo"] = "new bar" + if err := DB.Session(&gorm.Session{FullSaveAssociations: true}).Save(&value).Error; err != nil { + t.Errorf("failed to svae value, got err: %v", err) + } + + var result Value + if err := DB.Preload("Dep").First(&result).Error; err != nil { + t.Errorf("failed to find value, got err: %v", err) + } + if result.Dep.Params["foo"] != "new bar" { + t.Errorf("failed to save value dep params, got: %v", result.Dep.Params) + } +} + func TestFullSaveAssociations(t *testing.T) { coupon := &Coupon{ AppliesToProduct: []*CouponProduct{ diff --git a/tests/create_test.go b/tests/create_test.go index 5200427e..fb11ab82 100644 --- a/tests/create_test.go +++ b/tests/create_test.go @@ -8,6 +8,7 @@ import ( "time" "github.com/jinzhu/now" + "gorm.io/datatypes" "gorm.io/gorm" "gorm.io/gorm/clause" . "gorm.io/gorm/utils/tests" @@ -634,6 +635,38 @@ func TestCreateOnConflictWithDefaultNull(t *testing.T) { AssertEqual(t, u2.Mobile, "133xxxx") } +func TestCreateOnConflictWithDefaultJSON(t *testing.T) { + if DB.Dialector.Name() == "mysql" { + t.Skip() // mysql json can't have a default value + } + type OnConflictValue struct { + ID int + Params datatypes.JSONMap `gorm:"default:'{}'"` + } + + err := DB.Migrator().DropTable(&OnConflictValue{}) + AssertEqual(t, err, nil) + err = DB.AutoMigrate(&OnConflictValue{}) + AssertEqual(t, err, nil) + + v := OnConflictValue{ + Params: datatypes.JSONMap{"foo": "bar"}, + } + err = DB.Create(&v).Error + AssertEqual(t, err, nil) + + err = DB.Clauses(clause.OnConflict{UpdateAll: true}).Create(&OnConflictValue{ + ID: v.ID, + Params: datatypes.JSONMap{"foo": "new-bar"}, + }).Error + AssertEqual(t, err, nil) + + var v2 OnConflictValue + err = DB.Where("id = ?", v.ID).First(&v2).Error + AssertEqual(t, err, nil) + AssertEqual(t, v2.Params, datatypes.JSONMap{"foo": "new-bar"}) +} + func TestCreateFromMapWithoutPK(t *testing.T) { if !isMysql() { t.Skipf("This test case skipped, because of only supporting for mysql")