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

Fix create with default value

Browse Source
This commit is contained in:
Jinzhu 2020-06-25 08:00:10 +08:00
parent fb56fe993a
commit 1b28c187c0
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
migrator/migrator.go
View File

@ -65,10 +65,10 @@ func (m Migrator) FullDataTypeOf(field *schema.Field) (expr clause.Expr) {
} }
if field.HasDefaultValue && field.DefaultValue != "" { if field.HasDefaultValue && field.DefaultValue != "" {
if field.DataType == schema.String && field.DefaultValueInterface != nil { if field.DefaultValueInterface != nil {
defaultStmt := &gorm.Statement{Vars: []interface{}{field.DefaultValue}} defaultStmt := &gorm.Statement{Vars: []interface{}{field.DefaultValueInterface}}
m.Dialector.BindVarTo(defaultStmt, defaultStmt, field.DefaultValue) m.Dialector.BindVarTo(defaultStmt, defaultStmt, field.DefaultValueInterface)
expr.SQL += " DEFAULT " + m.Dialector.Explain(defaultStmt.SQL.String(), field.DefaultValue) expr.SQL += " DEFAULT " + m.Dialector.Explain(defaultStmt.SQL.String(), field.DefaultValueInterface)
} else { } else {
expr.SQL += " DEFAULT " + field.DefaultValue expr.SQL += " DEFAULT " + field.DefaultValue
} }

13
tests/default_value_test.go
View File

@ -9,10 +9,11 @@ import (
func TestDefaultValue(t *testing.T) { func TestDefaultValue(t *testing.T) {
type Harumph struct { type Harumph struct {
gorm.Model gorm.Model
Email string `gorm:"not null;"` Email string `gorm:"not null;index:,unique"`
Name string `gorm:"not null;default:foo"` Name string `gorm:"not null;default:'foo'"`
Name2 string `gorm:"not null;default:'foo'"` Name2 string `gorm:"not null;default:'foo'"`
Age int `gorm:"default:18"` Age int `gorm:"default:18"`
Enabled bool `gorm:"default:true"`
} }
DB.Migrator().DropTable(&Harumph{}) DB.Migrator().DropTable(&Harumph{})
@ -24,14 +25,14 @@ func TestDefaultValue(t *testing.T) {
var harumph = Harumph{Email: "hello@gorm.io"} var harumph = Harumph{Email: "hello@gorm.io"}
if err := DB.Create(&harumph).Error; err != nil { if err := DB.Create(&harumph).Error; err != nil {
t.Fatalf("Failed to create data with default value, got error: %v", err) t.Fatalf("Failed to create data with default value, got error: %v", err)
} else if harumph.Name != "foo" || harumph.Name2 != "foo" || harumph.Age != 18 { } else if harumph.Name != "foo" || harumph.Name2 != "foo" || harumph.Age != 18 || !harumph.Enabled {
t.Fatalf("Failed to create data with default value, got: %+v", harumph) t.Fatalf("Failed to create data with default value, got: %+v", harumph)
} }
var result Harumph var result Harumph
if err := DB.First(&result, "email = ?", "hello@gorm.io").Error; err != nil { if err := DB.First(&result, "email = ?", "hello@gorm.io").Error; err != nil {
t.Fatalf("Failed to find created data, got error: %v", err) t.Fatalf("Failed to find created data, got error: %v", err)
} else if result.Name != "foo" || result.Name2 != "foo" || result.Age != 18 { } else if result.Name != "foo" || result.Name2 != "foo" || result.Age != 18 || !result.Enabled {
t.Fatalf("Failed to find created data with default data, got %+v", result) t.Fatalf("Failed to find created data with default data, got %+v", result)
} }
} }

2
tests/go.mod
View File

@ -14,3 +14,5 @@ require (
) )
replace gorm.io/gorm => ../ replace gorm.io/gorm => ../
replace gorm.io/driver/sqlserver => /Users/jinzhu/Projects/sqlserver