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

refactor if...else and for logic

Browse Source
This commit is contained in:
daheige 2021-09-07 22:07:04 +08:00
parent a89d4d8fd5
commit 61bc71a53b
4 changed files with 149 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
callbacks/create.go
View File

@ -62,11 +62,25 @@ func Create(config *Config) func(db *gorm.DB) {
return
}
db.RowsAffected, _ = result.RowsAffected()
db.RowsAffected, err = result.RowsAffected()
if err != nil {
db.AddError(err)
return
}
if db.RowsAffected != 0 && db.Statement.Schema != nil &&
db.Statement.Schema.PrioritizedPrimaryField != nil && db.Statement.Schema.PrioritizedPrimaryField.HasDefaultValue {
if insertID, err := result.LastInsertId(); err == nil && insertID > 0 {
insertID, err := result.LastInsertId()
if err != nil {
db.AddError(err)
return
}
if insertID <= 0 {
// maybe log record
return
}
switch db.Statement.ReflectValue.Kind() {
case reflect.Slice, reflect.Array:
if config.LastInsertIDReversed {
@ -100,9 +114,6 @@ func Create(config *Config) func(db *gorm.DB) {
db.Statement.Schema.PrioritizedPrimaryField.Set(db.Statement.ReflectValue, insertID)
}
}
} else {
db.AddError(err)
}
}
}
}
@ -195,9 +206,14 @@ func CreateWithReturning(db *gorm.DB) {
}
}
} else if !db.DryRun && db.Error == nil {
if result, err := db.Statement.ConnPool.ExecContext(db.Statement.Context, db.Statement.SQL.String(), db.Statement.Vars...); err == nil {
db.RowsAffected, _ = result.RowsAffected()
} else {
result, err := db.Statement.ConnPool.ExecContext(db.Statement.Context, db.Statement.SQL.String(), db.Statement.Vars...)
if err != nil {
db.AddError(err)
return
}
db.RowsAffected, err = result.RowsAffected()
if err != nil {
db.AddError(err)
}
}

27
callbacks/delete.go
View File

@ -25,11 +25,20 @@ func BeforeDelete(db *gorm.DB) {
func DeleteBeforeAssociations(db *gorm.DB) {
if db.Error == nil && db.Statement.Schema != nil {
selectColumns, restricted := db.Statement.SelectAndOmitColumns(true, false)
if !restricted {
return
}
if restricted {
for column, v := range selectColumns {
if v {
if rel, ok := db.Statement.Schema.Relationships.Relations[column]; ok {
if !v {
continue
}
rel, ok := db.Statement.Schema.Relationships.Relations[column]
if !ok {
continue
}
switch rel.Type {
case schema.HasOne, schema.HasMany:
queryConds := rel.ToQueryConditions(db.Statement.ReflectValue)
@ -45,8 +54,8 @@ func DeleteBeforeAssociations(db *gorm.DB) {
for _, s := range db.Statement.Selects {
if s == clause.Associations {
selects = append(selects, s)
} else if strings.HasPrefix(s, column+".") {
selects = append(selects, strings.TrimPrefix(s, column+"."))
} else if columnPrefix := column + "."; strings.HasPrefix(s, columnPrefix) {
selects = append(selects, strings.TrimPrefix(s, columnPrefix))
}
}
@ -62,11 +71,9 @@ func DeleteBeforeAssociations(db *gorm.DB) {
}
}
if !withoutConditions {
if db.AddError(tx.Clauses(clause.Where{Exprs: queryConds}).Delete(modelValue).Error) != nil {
if !withoutConditions && db.AddError(tx.Clauses(clause.Where{Exprs: queryConds}).Delete(modelValue).Error) != nil {
return
}
}
case schema.Many2Many:
var (
queryConds = make([]clause.Expression, 0, len(rel.References))
@ -98,9 +105,7 @@ func DeleteBeforeAssociations(db *gorm.DB) {
}
}
}
}
}
}
}
}

12
callbacks/preload.go
View File

@ -145,7 +145,12 @@ func preload(db *gorm.DB, rel *schema.Relationship, conds []interface{}, preload
fieldValues[idx], _ = field.ValueOf(elem)
}
if datas, ok := identityMap[utils.ToStringKey(fieldValues...)]; ok {
datas, ok := identityMap[utils.ToStringKey(fieldValues...)]
if !ok {
db.AddError(fmt.Errorf("failed to assign association %#v, make sure foreign fields exists",
elem.Interface()))
}
for _, data := range datas {
reflectFieldValue := rel.Field.ReflectValueOf(data)
if reflectFieldValue.Kind() == reflect.Ptr && reflectFieldValue.IsNil() {
@ -155,7 +160,7 @@ func preload(db *gorm.DB, rel *schema.Relationship, conds []interface{}, preload
reflectFieldValue = reflect.Indirect(reflectFieldValue)
switch reflectFieldValue.Kind() {
case reflect.Struct:
rel.Field.Set(data, reflectResults.Index(i).Interface())
rel.Field.Set(data, elem.Interface())
case reflect.Slice, reflect.Array:
if reflectFieldValue.Type().Elem().Kind() == reflect.Ptr {
rel.Field.Set(data, reflect.Append(reflectFieldValue, elem).Interface())
@ -164,8 +169,5 @@ func preload(db *gorm.DB, rel *schema.Relationship, conds []interface{}, preload
}
}
}
} else {
db.AddError(fmt.Errorf("failed to assign association %#v, make sure foreign fields exists", elem.Interface()))
}
}
}

15
callbacks/update.go
View File

@ -61,11 +61,12 @@ func Update(db *gorm.DB) {
if db.Statement.SQL.String() == "" {
db.Statement.SQL.Grow(180)
db.Statement.AddClauseIfNotExists(clause.Update{})
if set := ConvertToAssignments(db.Statement); len(set) != 0 {
db.Statement.AddClause(set)
} else {
set := ConvertToAssignments(db.Statement)
if len(set) == 0 {
return
}
db.Statement.AddClause(set)
db.Statement.Build(db.Statement.BuildClauses...)
}
@ -76,12 +77,12 @@ func Update(db *gorm.DB) {
if !db.DryRun && db.Error == nil {
result, err := db.Statement.ConnPool.ExecContext(db.Statement.Context, db.Statement.SQL.String(), db.Statement.Vars...)
if err == nil {
db.RowsAffected, _ = result.RowsAffected()
} else {
if err != nil {
db.AddError(err)
return
}
db.RowsAffected, _ = result.RowsAffected()
}
}
}