Refactor if logic

[daheige]

I think the readability of the code is more important. The unnecessary if...else can be completely removed. At the same time, the processing of err should be processed as early as possible, so that the logic can be read coherently, clearly and clearly, and it can also enhance the maintainability of the code. And expandability.

[jinzhu]

some driver doesn't support LastInsertId, maybe should not return an error here.

[daheige]

@jinzhu I have adjusted it, please CR/MR again

[daheige]

Maybe as you said, can you provide an example? If so, I'll change it here

…

------------------ Original ------------------ From: Jinzhu ***@***.***> Date: Thu,Sep 9,2021 1:13 PM To: go-gorm/gorm ***@***.***> Cc: heige ***@***.***>, Author ***@***.***> Subject: Re: [go-gorm/gorm] Refactor if logic (#4683) @jinzhu commented on this pull request. In callbacks/create.go: > 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 { -switch db.Statement.ReflectValue.Kind() { -case reflect.Slice, reflect.Array: -if config.LastInsertIDReversed { -for i := db.Statement.ReflectValue.Len() - 1; i >= 0; i-- { -rv := db.Statement.ReflectValue.Index(i) -if reflect.Indirect(rv).Kind() != reflect.Struct { -break -} +insertID, err := result.LastInsertId() some driver doesn't support LastInsertId, maybe should not return an error here. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub, or unsubscribe. Triage notifications on the go with GitHub Mobile for iOS or Android.

[jinzhu]

Why does this line uses a different code style?

[daheige]

i have adjust it, please CR/MR again. 原始邮件 发件人: ***@***.***> 收件人: ***@***.***> 抄送: ***@***.***>; ***@***.***> 发送时间: 2021年10月8日(周五) 13:54 主题: Re: [go-gorm/gorm] Refactor if logic (#4683) @jinzhu commented on this pull request. In callbacks/update.go:

@@ -51,39 +51,38 @@ func BeforeUpdate(db *gorm.DB) { } func Update(db *gorm.DB) { - if db.Error != nil { - return - } - - if db.Statement.Schema != nil && !db.Statement.Unscoped { - for _, c := range db.Statement.Schema.UpdateClauses { - db.Statement.AddClause(c) + if db.Error == nil {

Why does this line uses a different code style? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub, or unsubscribe. Triage notifications on the go with GitHub Mobile for iOS or Android.

[jinzhu]

the error of RowsAffected doesn't matter, should not rollback the whole transaction if happens

[jinzhu]

return is not necessary?

[daheige]

yes 发自我的iPhone

…

------------------ Original ------------------ From: Jinzhu ***@***.***> Date: Fri,Oct 15,2021 10:43 AM To: go-gorm/gorm ***@***.***> Cc: heige ***@***.***>, Author ***@***.***> Subject: Re: [go-gorm/gorm] Refactor if logic (#4683)

[daheige]

ok,i will rebase master and revert it 发自我的iPhone

…

------------------ Original ------------------ From: Jinzhu ***@***.***> Date: Fri,Oct 15,2021 10:41 AM To: go-gorm/gorm ***@***.***> Cc: heige ***@***.***>, Author ***@***.***> Subject: Re: [go-gorm/gorm] Refactor if logic (#4683) @jinzhu commented on this pull request. In callbacks/create.go: > @@ -195,9 +197,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() the error of RowsAffected doesn't matter, should not rollback the whole transaction if happens — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub, or unsubscribe. Triage notifications on the go with GitHub Mobile for iOS or Android.

[daheige]

@jinzhu i has adjusted these code,please CR/MR,thanks!