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

fix: db.Statement.ReflectValue不是指针型的时候AfterCreate, BeforeUpdate, AfterUpdate会panic

Browse Source
This commit is contained in:
leiyuqing 2022-03-27 20:52:56 +08:00
parent 68fddafbf9
commit 5d0bc6e309
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
callbacks/callbacks.go
View File

@ -24,10 +24,6 @@ func RegisterDefaultCallbacks(db *gorm.DB, config *Config) {
return !db.SkipDefaultTransaction return !db.SkipDefaultTransaction
} }
canAddr := func(db *gorm.DB) bool {
return db.Statement.ReflectValue.CanAddr()
}
if len(config.CreateClauses) == 0 { if len(config.CreateClauses) == 0 {
config.CreateClauses = createClauses config.CreateClauses = createClauses
} }
@ -43,11 +39,11 @@ func RegisterDefaultCallbacks(db *gorm.DB, config *Config) {
createCallback := db.Callback().Create() createCallback := db.Callback().Create()
createCallback.Match(enableTransaction).Register("gorm:begin_transaction", BeginTransaction) createCallback.Match(enableTransaction).Register("gorm:begin_transaction", BeginTransaction)
createCallback.Match(canAddr).Register("gorm:before_create", BeforeCreate) createCallback.Register("gorm:before_create", BeforeCreate)
createCallback.Register("gorm:save_before_associations", SaveBeforeAssociations(true)) createCallback.Register("gorm:save_before_associations", SaveBeforeAssociations(true))
createCallback.Register("gorm:create", Create(config)) createCallback.Register("gorm:create", Create(config))
createCallback.Register("gorm:save_after_associations", SaveAfterAssociations(true)) createCallback.Register("gorm:save_after_associations", SaveAfterAssociations(true))
createCallback.Match(canAddr).Register("gorm:after_create", AfterCreate) createCallback.Register("gorm:after_create", AfterCreate)
createCallback.Match(enableTransaction).Register("gorm:commit_or_rollback_transaction", CommitOrRollbackTransaction) createCallback.Match(enableTransaction).Register("gorm:commit_or_rollback_transaction", CommitOrRollbackTransaction)
createCallback.Clauses = config.CreateClauses createCallback.Clauses = config.CreateClauses
@ -69,11 +65,11 @@ func RegisterDefaultCallbacks(db *gorm.DB, config *Config) {
updateCallback := db.Callback().Update() updateCallback := db.Callback().Update()
updateCallback.Match(enableTransaction).Register("gorm:begin_transaction", BeginTransaction) updateCallback.Match(enableTransaction).Register("gorm:begin_transaction", BeginTransaction)
updateCallback.Register("gorm:setup_reflect_value", SetupUpdateReflectValue) updateCallback.Register("gorm:setup_reflect_value", SetupUpdateReflectValue)
updateCallback.Match(canAddr).Register("gorm:before_update", BeforeUpdate) updateCallback.Register("gorm:before_update", BeforeUpdate)
updateCallback.Register("gorm:save_before_associations", SaveBeforeAssociations(false)) updateCallback.Register("gorm:save_before_associations", SaveBeforeAssociations(false))
updateCallback.Register("gorm:update", Update(config)) updateCallback.Register("gorm:update", Update(config))
updateCallback.Register("gorm:save_after_associations", SaveAfterAssociations(false)) updateCallback.Register("gorm:save_after_associations", SaveAfterAssociations(false))
updateCallback.Match(canAddr).Register("gorm:after_update", AfterUpdate) updateCallback.Register("gorm:after_update", AfterUpdate)
updateCallback.Match(enableTransaction).Register("gorm:commit_or_rollback_transaction", CommitOrRollbackTransaction) updateCallback.Match(enableTransaction).Register("gorm:commit_or_rollback_transaction", CommitOrRollbackTransaction)
updateCallback.Clauses = config.UpdateClauses updateCallback.Clauses = config.UpdateClauses

7
callbacks/create.go
View File

@ -12,6 +12,9 @@ import (
// BeforeCreate before create hooks // BeforeCreate before create hooks
func BeforeCreate(db *gorm.DB) { func BeforeCreate(db *gorm.DB) {
if !db.Statement.ReflectValue.CanAddr() {
return
}
if db.Error == nil && db.Statement.Schema != nil && !db.Statement.SkipHooks && (db.Statement.Schema.BeforeSave || db.Statement.Schema.BeforeCreate) { if db.Error == nil && db.Statement.Schema != nil && !db.Statement.SkipHooks && (db.Statement.Schema.BeforeSave || db.Statement.Schema.BeforeCreate) {
callMethod(db, func(value interface{}, tx *gorm.DB) (called bool) { callMethod(db, func(value interface{}, tx *gorm.DB) (called bool) {
if db.Statement.Schema.BeforeSave { if db.Statement.Schema.BeforeSave {
@ -150,6 +153,10 @@ func Create(config *Config) func(db *gorm.DB) {
// AfterCreate after create hooks // AfterCreate after create hooks
func AfterCreate(db *gorm.DB) { func AfterCreate(db *gorm.DB) {
if !db.Statement.ReflectValue.CanAddr() {
return
}
if db.Error == nil && db.Statement.Schema != nil && !db.Statement.SkipHooks && (db.Statement.Schema.AfterSave || db.Statement.Schema.AfterCreate) { if db.Error == nil && db.Statement.Schema != nil && !db.Statement.SkipHooks && (db.Statement.Schema.AfterSave || db.Statement.Schema.AfterCreate) {
callMethod(db, func(value interface{}, tx *gorm.DB) (called bool) { callMethod(db, func(value interface{}, tx *gorm.DB) (called bool) {
if db.Statement.Schema.AfterCreate { if db.Statement.Schema.AfterCreate {

8
callbacks/update.go
View File

@ -31,6 +31,10 @@ func SetupUpdateReflectValue(db *gorm.DB) {
// BeforeUpdate before update hooks // BeforeUpdate before update hooks
func BeforeUpdate(db *gorm.DB) { func BeforeUpdate(db *gorm.DB) {
if !db.Statement.ReflectValue.CanAddr() {
return
}
if db.Error == nil && db.Statement.Schema != nil && !db.Statement.SkipHooks && (db.Statement.Schema.BeforeSave || db.Statement.Schema.BeforeUpdate) { if db.Error == nil && db.Statement.Schema != nil && !db.Statement.SkipHooks && (db.Statement.Schema.BeforeSave || db.Statement.Schema.BeforeUpdate) {
callMethod(db, func(value interface{}, tx *gorm.DB) (called bool) { callMethod(db, func(value interface{}, tx *gorm.DB) (called bool) {
if db.Statement.Schema.BeforeSave { if db.Statement.Schema.BeforeSave {
@ -103,6 +107,10 @@ func Update(config *Config) func(db *gorm.DB) {
// AfterUpdate after update hooks // AfterUpdate after update hooks
func AfterUpdate(db *gorm.DB) { func AfterUpdate(db *gorm.DB) {
if !db.Statement.ReflectValue.CanAddr() {
return
}
if db.Error == nil && db.Statement.Schema != nil && !db.Statement.SkipHooks && (db.Statement.Schema.AfterSave || db.Statement.Schema.AfterUpdate) { if db.Error == nil && db.Statement.Schema != nil && !db.Statement.SkipHooks && (db.Statement.Schema.AfterSave || db.Statement.Schema.AfterUpdate) {
callMethod(db, func(value interface{}, tx *gorm.DB) (called bool) { callMethod(db, func(value interface{}, tx *gorm.DB) (called bool) {
if db.Statement.Schema.AfterUpdate { if db.Statement.Schema.AfterUpdate {