mirror
/
gorm
mirror of https://github.com/go-gorm/gorm.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Handle create with default db values

This commit is contained in:
Jinzhu 2020-02-20 10:13:26 +08:00
parent 15ce5b3cdd
commit 43ce0b8af2
2 changed files with 65 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
callbacks/create.go
View File

@ -59,15 +59,18 @@ func ConvertToCreateValues(stmt *gorm.Statement) (clause.Values, []map[string]in
)
for _, db := range stmt.Schema.DBNames {
if stmt.Schema.FieldsWithDefaultDBValue[db] == nil {
if v, ok := selectColumns[db]; (ok && v) || (!ok && !restricted) {
values.Columns = append(values.Columns, clause.Column{Name: db})
}
}
}
reflectValue := reflect.Indirect(reflect.ValueOf(stmt.Dest))
switch reflectValue.Kind() {
case reflect.Slice, reflect.Array:
values.Values = make([][]interface{}, reflectValue.Len())
defaultValueFieldsHavingValue := map[string][]interface{}{}
for i := 0; i < reflectValue.Len(); i++ {
rv := reflect.Indirect(reflectValue.Index(i))
values.Values[i] = make([]interface{}, len(values.Columns))
@ -80,18 +83,29 @@ func ConvertToCreateValues(stmt *gorm.Statement) (clause.Values, []map[string]in
} else if field.AutoCreateTime > 0 || field.AutoUpdateTime > 0 {
field.Set(rv, curTime)
values.Values[i][idx], _ = field.ValueOf(rv)
} else if field.HasDefaultValue {
if len(returnningValues) == 0 {
returnningValues = make([]map[string]interface{}, reflectValue.Len())
}
}
}
if returnningValues[i] == nil {
returnningValues[i] = map[string]interface{}{}
for db, field := range stmt.Schema.FieldsWithDefaultDBValue {
if v, ok := selectColumns[db]; (ok && v) || (!ok && !restricted) {
if v, isZero := field.ValueOf(rv); !isZero {
if len(defaultValueFieldsHavingValue[db]) == 0 {
defaultValueFieldsHavingValue[db] = make([]interface{}, reflectValue.Len())
}
defaultValueFieldsHavingValue[db][i] = v
}
}
}
}
// FIXME
returnningValues[i][column.Name] = field.ReflectValueOf(reflectValue).Addr().Interface()
}
for db, vs := range defaultValueFieldsHavingValue {
values.Columns = append(values.Columns, clause.Column{Name: db})
for idx := range values.Values {
if vs[idx] == nil {
values.Values[idx] = append(values.Values[idx], clause.Expr{SQL: "DEFAULT"})
} else {
values.Values[idx] = append(values.Values[idx], vs[idx])
}
}
}
@ -99,25 +113,27 @@ func ConvertToCreateValues(stmt *gorm.Statement) (clause.Values, []map[string]in
values.Values = [][]interface{}{make([]interface{}, len(values.Columns))}
for idx, column := range values.Columns {
field := stmt.Schema.FieldsByDBName[column.Name]
if values.Values[0][idx], _ = field.ValueOf(reflectValue); isZero {
if values.Values[0][idx], isZero = field.ValueOf(reflectValue); isZero {
if field.DefaultValueInterface != nil {
values.Values[0][idx] = field.DefaultValueInterface
field.Set(reflectValue, field.DefaultValueInterface)
} else if field.AutoCreateTime > 0 || field.AutoUpdateTime > 0 {
field.Set(reflectValue, curTime)
values.Values[0][idx], _ = field.ValueOf(reflectValue)
} else if field.HasDefaultValue {
if len(returnningValues) == 0 {
returnningValues = make([]map[string]interface{}, 1)
}
}
}
values.Values[0][idx] = clause.Expr{SQL: "DEFAULT"}
returnningValues[0][column.Name] = field.ReflectValueOf(reflectValue).Addr().Interface()
} else if field.PrimaryKey {
for db, field := range stmt.Schema.FieldsWithDefaultDBValue {
if v, ok := selectColumns[db]; (ok && v) || (!ok && !restricted) {
if v, isZero := field.ValueOf(reflectValue); !isZero {
values.Columns = append(values.Columns, clause.Column{Name: db})
values.Values[0] = append(values.Values[0], v)
}
}
}
}
return values, returnningValues
}
}

15
schema/schema.go
View File

@ -23,6 +23,7 @@ type Schema struct {
Fields []*Field
FieldsByName map[string]*Field
FieldsByDBName map[string]*Field
FieldsWithDefaultDBValue map[string]*Field // fields with default value assigned by database
Relationships Relationships
err error
namer Namer
@ -146,6 +147,20 @@ func Parse(dest interface{}, cacheStore *sync.Map, namer Namer) (*Schema, error)
}
}
schema.FieldsWithDefaultDBValue = map[string]*Field{}
for db, field := range schema.FieldsByDBName {
if field.HasDefaultValue && field.DefaultValueInterface == nil {
schema.FieldsWithDefaultDBValue[db] = field
}
}
if schema.PrioritizedPrimaryField != nil {
switch schema.PrioritizedPrimaryField.DataType {
case Int, Uint:
schema.FieldsWithDefaultDBValue[schema.PrioritizedPrimaryField.DBName] = schema.PrioritizedPrimaryField
}
}
cacheStore.Store(modelType, schema)
// parse relations for unidentified fields